Fixup wizard init based on changes in #367

azavea · Dec 22, 2017 · 5147a6f · 5147a6f
1 parent e71a31e
commit 5147a6f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/angular/planit/src/app/risk-wizard/risk-wizard.component.ts b/src/angular/planit/src/app/risk-wizard/risk-wizard.component.ts
@@ -29,8 +29,12 @@ export class RiskWizardComponent implements AfterViewInit, OnDestroy, OnInit {
 
   ngOnInit() {
     // TODO: Set initial risk from API
-    this.session.setData(new Risk({}));
-    this.session.data.subscribe(risk => this.riskModelChanged(risk));
+    const risk = new Risk({
+      communitySystem: { name: '' },
+      weatherEvent: { name: '' }
+    });
+    this.session.setData(risk);
+    this.session.data.subscribe(r => this.riskModelChanged(r));
   }
 
   ngOnDestroy() {

diff --git a/src/angular/planit/src/app/risk-wizard/steps/identify-step.component.ts b/src/angular/planit/src/app/risk-wizard/steps/identify-step.component.ts
@@ -29,7 +29,7 @@ export class IdentifyStepComponent extends WizardStepComponent<Risk> implements
 
   ngOnInit() {
     super.ngOnInit();
-    const risk = this.session.getData() || new Risk({});
+    const risk = this.session.getData();
     this.setupForm(this.fromModel(risk));
   }
 
@@ -39,7 +39,7 @@ export class IdentifyStepComponent extends WizardStepComponent<Risk> implements
 
   fromModel(risk: Risk): IdentifyStepFormModel {
     return {
-      hazard: risk.impactDescription,
+      hazard: risk.weatherEvent.name,
       communitySystem: risk.communitySystem.name
     };
   }
@@ -60,7 +60,7 @@ export class IdentifyStepComponent extends WizardStepComponent<Risk> implements
   }
 
   toModel(data: IdentifyStepFormModel, risk: Risk) {
-    risk.hazard = data.hazard;
+    risk.weatherEvent.name = data.hazard;
     risk.communitySystem.name = data.communitySystem;
     return risk;
   }

diff --git a/src/angular/planit/src/app/shared/models/risk.model.ts b/src/angular/planit/src/app/shared/models/risk.model.ts
@@ -17,7 +17,13 @@ export class Risk {
   intensity: OrgRiskDirectionalOption = OrgRiskDirectionalOption.Unsure;
   probability: OrgRiskRelativeOption = OrgRiskRelativeOption.Unsure;
 
-  constructor(object: Object) {
+  constructor(object: any) {
     Object.assign(this, object);
+    if (object.communitySystem) {
+      this.communitySystem = Object.assign({}, object.communitySystem);
+    }
+    if (object.weatherEvent) {
+      this.weatherEvent = Object.assign({}, object.weatherEvent);
+    }
   }
 }