Don't overwrite options object

Author: trslater

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, {

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, {

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',

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',