From 74e75f4674664f258c6138576b218436c212d84e Mon Sep 17 00:00:00 2001
From: Markus Grigull <web@grigull.me>
Date: Fri, 20 Apr 2018 10:35:04 +0200
Subject: [PATCH] Fix simulation model simulator name

---
 src/components/dialog/edit-simulation-model.js   | 3 ++-
 src/components/dialog/import-simulation-model.js | 3 ++-
 src/components/dialog/new-simulation-model.js    | 3 ++-
 src/containers/simulation.js                     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/dialog/edit-simulation-model.js b/src/components/dialog/edit-simulation-model.js
index 3450a54..6b73a8c 100644
--- a/src/components/dialog/edit-simulation-model.js
+++ b/src/components/dialog/edit-simulation-model.js
@@ -21,6 +21,7 @@
 
 import React from 'react';
 import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
+import _ from 'lodash';
 
 import Table from '../table';
 import TableColumn from '../table-column';
@@ -140,7 +141,7 @@ class EditSimulationModelDialog extends React.Component {
             <ControlLabel>Simulator</ControlLabel>
             <FormControl componentClass="select" placeholder="Select simulator" value={this.state.simulator} onChange={(e) => this.handleChange(e)}>
               {this.props.simulators.map(simulator => (
-                <option key={simulator._id} value={simulator._id}>{simulator.rawProperties.name}</option>
+                <option key={simulator._id} value={simulator._id}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
               ))}
             </FormControl>
           </FormGroup>
diff --git a/src/components/dialog/import-simulation-model.js b/src/components/dialog/import-simulation-model.js
index b333bd3..1f9a2ff 100644
--- a/src/components/dialog/import-simulation-model.js
+++ b/src/components/dialog/import-simulation-model.js
@@ -21,6 +21,7 @@
 
 import React from 'react';
 import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
+import _ from 'lodash';
 
 import Table from '../table';
 import TableColumn from '../table-column';
@@ -175,7 +176,7 @@ class ImportSimulationModelDialog extends React.Component {
             <ControlLabel>Simulator</ControlLabel>
             <FormControl readOnly={!this.imported} componentClass="select" placeholder="Select simulator" value={this.state.simulator} onChange={(e) => this.handleChange(e)}>
               {this.props.simulators.map(simulator => (
-                <option key={simulator._id} value={simulator}>{simulator.rawProperties.name}</option>
+                <option key={simulator._id} value={simulator}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
               ))}
             </FormControl>
           </FormGroup>
diff --git a/src/components/dialog/new-simulation-model.js b/src/components/dialog/new-simulation-model.js
index 5106355..33efbed 100644
--- a/src/components/dialog/new-simulation-model.js
+++ b/src/components/dialog/new-simulation-model.js
@@ -21,6 +21,7 @@
 
 import React from 'react';
 import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
+import _ from 'lodash';
 
 import Table from '../table';
 import TableColumn from '../table-column';
@@ -146,7 +147,7 @@ class NewSimulationModelDialog extends React.Component {
             <ControlLabel>Simulator</ControlLabel>
             <FormControl componentClass="select" placeholder="Select simulator" value={this.state.simulator} onChange={(e) => this.handleChange(e)}>
               {this.props.simulators.map(simulator => (
-                <option key={simulator._id} value={simulator._id}>{simulator.rawProperties.name}</option>
+                <option key={simulator._id} value={simulator._id}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
               ))}
             </FormControl>
           </FormGroup>
diff --git a/src/containers/simulation.js b/src/containers/simulation.js
index 109066d..df19dd6 100644
--- a/src/containers/simulation.js
+++ b/src/containers/simulation.js
@@ -23,6 +23,7 @@ import React from 'react';
 import { Container } from 'flux/utils';
 import { Button, Glyphicon } from 'react-bootstrap';
 import FileSaver from 'file-saver';
+import _ from 'lodash';
 
 import SimulationStore from '../stores/simulation-store';
 import SimulatorStore from '../stores/simulator-store';
@@ -159,7 +160,7 @@ class Simulation extends React.Component {
     for (let simulator of this.state.simulators) {
       if (simulator._id === simulatorId) {
         if ('name' in simulator.rawProperties) {
-          return simulator.rawProperties.name;
+          return _.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name');
         } else {
           return simulator.uuid;
         }