From cfed860ea57af95b84b10b628b4f823b48c92209 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 7 May 2018 01:25:03 +0200 Subject: [PATCH] do not access simulator.rawProperties without checking for it --- src/containers/simulation.js | 38 ++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/containers/simulation.js b/src/containers/simulation.js index 6028a56..d772a61 100644 --- a/src/containers/simulation.js +++ b/src/containers/simulation.js @@ -154,7 +154,7 @@ class Simulation extends React.Component { if (data) { data.simulation = this.state.simulation._id; - + AppDispatcher.dispatch({ type: 'simulationModels/start-add', data, @@ -174,11 +174,7 @@ class Simulation extends React.Component { getSimulatorName(simulatorId) { for (let simulator of this.state.simulators) { if (simulator._id === simulatorId) { - if ('name' in simulator.rawProperties) { - return _.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name'); - } else { - return simulator.uuid; - } + return _.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name') || simulator.uuid; } } } @@ -232,7 +228,7 @@ class Simulation extends React.Component { if (simulator == null) { continue; } - + AppDispatcher.dispatch({ type: 'simulators/start-action', simulator, @@ -253,27 +249,27 @@ class Simulation extends React.Component { this.getSimulatorName(simulator)} /> - this.setState({ editModal: true, modalData: this.state.simulationModels[index], modalIndex: index })} - onDelete={(index) => this.setState({ deleteModal: true, modalData: this.state.simulationModels[index], modalIndex: index })} + onEdit={(index) => this.setState({ editModal: true, modalData: this.state.simulationModels[index], modalIndex: index })} + onDelete={(index) => this.setState({ deleteModal: true, modalData: this.state.simulationModels[index], modalIndex: index })} onExport={index => this.exportModel(index)} />
-