From 3d4d8d105c612589f13b925b72f0de46a2c335ee Mon Sep 17 00:00:00 2001
From: Markus Grigull <web@grigull.me>
Date: Wed, 26 Jul 2017 10:44:04 +0200
Subject: [PATCH] Fix new simulation model dialog

Update react-bootstrap to newest version
---
 package.json                                  | 2 +-
 src/components/dialog/new-simulation-model.js | 2 +-
 src/components/dialog/new-simulator.js        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c423476..98e3fa3 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "rc-slider": "^7.0.1",
     "rd3": "^0.7.4",
     "react": "^15.4.2",
-    "react-bootstrap": "^0.30.7",
+    "react-bootstrap": "^0.31.1",
     "react-contextmenu": "^2.3.0",
     "react-d3": "^0.4.0",
     "react-dnd": "^2.2.4",
diff --git a/src/components/dialog/new-simulation-model.js b/src/components/dialog/new-simulation-model.js
index a0af323..79b3548 100644
--- a/src/components/dialog/new-simulation-model.js
+++ b/src/components/dialog/new-simulation-model.js
@@ -134,7 +134,7 @@ class NewSimulationModelDialog extends Component {
           </FormGroup>
           <FormGroup controlId="simulator" validationState={this.validateForm('simulator')}>
             <ControlLabel>Simulator</ControlLabel>
-            <FormControl componentClass="select" placeholder="Select simulator" value={this.state.simulator.node + '/' + this.state.simulator.simulator} onChange={(e) => this.handleChange(e)}>
+            <FormControl componentClass="select" placeholder="Select simulator" value={JSON.stringify({ node: this.state.simulator.node, simulator: this.state.simulator.simulator})} onChange={(e) => this.handleChange(e)}>
               {this.props.nodes.map(node => (
                 node.simulators.map((simulator, index) => (
                   <option key={node._id + index} value={JSON.stringify({ node: node._id, simulator: index })}>{node.name}/{simulator.name}</option>
diff --git a/src/components/dialog/new-simulator.js b/src/components/dialog/new-simulator.js
index f4c293d..3d9890c 100644
--- a/src/components/dialog/new-simulator.js
+++ b/src/components/dialog/new-simulator.js
@@ -60,7 +60,7 @@ class NewSimulatorDialog extends Component {
     // check all controls
     var name = true;
 
-    if (this.state.name === '' || this.props.node.simulators.find(simulator => simulator.name === this.state.name) !== undefined) {
+    if (this.state.name === '' || this.props.node.simulators == null || this.props.node.simulators.find(simulator => simulator.name === this.state.name) !== undefined) {
       name = false;
     }