Merge pull request #1974 from bcgov/bugfix/ALCS-2374

Patch structures questions after updating visibility

Author: trslater

portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts

@@ -184,11 +184,6 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
           fillProjectDuration: applicationSubmission.fillProjectDuration,
           isExtractionOrMining: formatBooleanToString(applicationSubmission.soilIsExtractionOrMining),
           hasSubmittedNotice: formatBooleanToString(applicationSubmission.soilHasSubmittedNotice),
-          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
-          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
-          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
-          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
-          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
         });
 
         this.structuresForm = new FormGroup({});
@@ -202,6 +197,15 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
         this.updateStructureTypeFields();
+
+        this.form.patchValue({
+          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
+          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
+          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
+          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
+          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
+        });
+
         if (this.showErrors) {
           this.form.markAllAsTouched();
           this.structuresForm.markAllAsTouched();

portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts

@@ -146,11 +146,6 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
           alternativeMeasures: applicationSubmission.soilAlternativeMeasures,
           reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts,
           projectDuration: applicationSubmission.soilProjectDuration,
-          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
-          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
-          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
-          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
-          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
         });
 
         this.proposedStructures = [];
@@ -164,6 +159,15 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
         this.updateStructureTypeFields();
+
+        this.form.patchValue({
+          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
+          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
+          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
+          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
+          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
+        });
+
         if (this.showErrors) {
           this.form.markAllAsTouched();
           this.structuresForm.markAllAsTouched();

portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts

@@ -143,11 +143,6 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
           soilTypeRemoved: applicationSubmission.soilTypeRemoved,
           reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts,
           projectDuration: applicationSubmission.soilProjectDuration,
-          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
-          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
-          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
-          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
-          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
         });
 
         this.proposedStructures = [];
@@ -161,6 +156,15 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
         this.updateStructureTypeFields();
+
+        this.form.patchValue({
+          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
+          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
+          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
+          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
+          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
+        });
+
         if (this.showErrors) {
           this.form.markAllAsTouched();
           this.structuresForm.markAllAsTouched();