From cd84d809952b2556dda619517fceba4d9f808be6 Mon Sep 17 00:00:00 2001 From: Tristan Slater <1631008+trslater@users.noreply.github.com> Date: Wed, 26 Feb 2025 16:00:55 -0800 Subject: [PATCH] Don't overwrite options object --- .../documents/documents.component.ts | 24 +++++++++++++++---- .../documents/documents.component.ts | 24 +++++++++++++++---- .../documents/documents.component.ts | 18 ++++++++++++++ .../documents/documents.component.ts | 18 ++++++++++++++ 4 files changed, 76 insertions(+), 8 deletions(-) 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 deb7d5e2f..3da938a5b 100644 --- a/alcs-frontend/src/app/features/application/documents/documents.component.ts +++ b/alcs-frontend/src/app/features/application/documents/documents.component.ts @@ -63,8 +63,15 @@ export class DocumentsComponent implements OnInit { } async onUploadFile() { - const submission = await this.applicationSubmissionService.fetchSubmission(this.fileId); - const parcels = await this.applicationParcelService.fetchParcels(this.fileId); + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + fileId: this.fileId, + documentService: this.applicationDocumentService, + parcelService: this.applicationParcelService, + submissionService: this.applicationSubmissionService, + }, + }; this.dialog .open(DocumentUploadDialogComponent, { @@ -126,8 +133,17 @@ export class DocumentsComponent implements OnInit { } async onEditFile(element: ApplicationDocumentDto) { - const submission = await this.applicationSubmissionService.fetchSubmission(this.fileId); - const parcels = await this.applicationParcelService.fetchParcels(this.fileId); + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + allowsFileEdit: element.system === DOCUMENT_SYSTEM.ALCS, + fileId: this.fileId, + existingDocument: element, + documentService: this.applicationDocumentService, + parcelService: this.applicationParcelService, + submissionService: this.applicationSubmissionService, + }, + }; this.dialog .open(DocumentUploadDialogComponent, { 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 60fc85646..13520875b 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 @@ -67,8 +67,15 @@ export class NoiDocumentsComponent implements OnInit { } async onUploadFile() { - const submission = await this.noiSubmissionService.fetchSubmission(this.fileId); - const parcels = await this.noiParcelService.fetchParcels(this.fileId); + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + fileId: this.fileId, + documentService: this.noiDocumentService, + parcelService: this.noiParcelService, + submissionService: this.noiSubmissionService, + }, + }; this.dialog .open(DocumentUploadDialogComponent, { @@ -116,8 +123,17 @@ export class NoiDocumentsComponent implements OnInit { } async onEditFile(element: NoticeOfIntentDocumentDto) { - const submission = await this.noiSubmissionService.fetchSubmission(this.fileId); - const parcels = await this.noiParcelService.fetchParcels(this.fileId); + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + allowsFileEdit: element.system === DOCUMENT_SYSTEM.ALCS, + fileId: this.fileId, + existingDocument: element, + documentService: this.noiDocumentService, + parcelService: this.noiParcelService, + submissionService: this.noiSubmissionService, + }, + }; this.dialog .open(DocumentUploadDialogComponent, { diff --git a/alcs-frontend/src/app/features/notification/documents/documents.component.ts b/alcs-frontend/src/app/features/notification/documents/documents.component.ts index 304785905..bdb9b3212 100644 --- a/alcs-frontend/src/app/features/notification/documents/documents.component.ts +++ b/alcs-frontend/src/app/features/notification/documents/documents.component.ts @@ -48,6 +48,14 @@ export class NotificationDocumentsComponent implements OnInit { } async onUploadFile() { + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + fileId: this.fileId, + documentService: this.notificationDocumentService, + }, + }; + this.dialog .open(DocumentUploadDialogComponent, { minWidth: '600px', @@ -91,6 +99,16 @@ export class NotificationDocumentsComponent implements OnInit { } onEditFile(element: NoticeOfIntentDocumentDto) { + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + allowsFileEdit: element.system === DOCUMENT_SYSTEM.ALCS, + fileId: this.fileId, + existingDocument: element, + documentService: this.notificationDocumentService, + }, + }; + this.dialog .open(DocumentUploadDialogComponent, { minWidth: '600px', diff --git a/alcs-frontend/src/app/features/planning-review/documents/documents.component.ts b/alcs-frontend/src/app/features/planning-review/documents/documents.component.ts index f666bed56..b910125d6 100644 --- a/alcs-frontend/src/app/features/planning-review/documents/documents.component.ts +++ b/alcs-frontend/src/app/features/planning-review/documents/documents.component.ts @@ -48,6 +48,14 @@ export class DocumentsComponent implements OnInit { } async onUploadFile() { + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + fileId: this.fileId, + documentService: this.planningReviewDocumentService, + }, + }; + this.dialog .open(DocumentUploadDialogComponent, { minWidth: '600px', @@ -91,6 +99,16 @@ export class DocumentsComponent implements OnInit { } onEditFile(element: PlanningReviewDocumentDto) { + const data: DocumentUploadDialogData = { + ...DOCUMENT_UPLOAD_DIALOG_OPTIONS, + ...{ + allowsFileEdit: element.system === DOCUMENT_SYSTEM.ALCS, + fileId: this.fileId, + existingDocument: element, + documentService: this.planningReviewDocumentService, + }, + }; + this.dialog .open(DocumentUploadDialogComponent, { minWidth: '600px',