Merge pull request #556 from Kitware/get-fix

added safer get(taskflow, '...cluster._id) to inline conditionals

Author: TristanWright

src/workflows/nwchem/common/steps/Visualization/View/index.js

@@ -108,7 +108,7 @@ const VisualizationView = React.createClass({
     return (
       <div>
         <JobMonitor taskflowId={ taskflowId }
-          clusterId={taskflow.flow.meta ? taskflow.flow.meta.cluster._id : null}
+          clusterId={get(taskflow, 'flow.meta.cluster._id') ? taskflow.flow.meta.cluster._id : null}
         />
         <FileListing title="Input Files" folderId={simulation.metadata.inputFolder._id}
           actionsDisbled={fileActionsDisabled} />

src/workflows/pyfr/components/steps/Simulation/View/index.js

@@ -95,7 +95,7 @@ const SimualtionView = React.createClass({
     return (
       <div>
         <JobMonitor taskflowId={ taskflowId }
-          clusterId={taskflow.flow.meta ? taskflow.flow.meta.cluster._id : null}
+          clusterId={get(taskflow, 'flow.meta.cluster._id') ? taskflow.flow.meta.cluster._id : null}
         />
         <FileListing title="Input Files" folderId={simulation.metadata.inputFolder._id} actionsDisabled={fileActionsDisabled} />
         <FileListing title="Output Files" folderId={simulation.metadata.outputFolder._id} actionsDisabled={fileActionsDisabled} />

src/workflows/pyfr/components/steps/Visualization/View/index.js

@@ -106,7 +106,7 @@ const VisualizationView = React.createClass({
     return (
       <div>
         <JobMonitor taskflowId={ taskflowId }
-          clusterId={taskflow.flow.meta ? taskflow.flow.meta.cluster._id : null}
+          clusterId={get(taskflow, 'flow.meta.cluster._id') ? taskflow.flow.meta.cluster._id : null}
         />
         <FileListing title="Input Files" folderId={simulation.metadata.outputFolder._id}
           actionsDisbled={fileActionsDisabled} />

src/workflows/visualizer/components/steps/Visualization/View/index.js

@@ -100,7 +100,7 @@ const visualizationView = React.createClass({
     return (
       <div>
         <JobMonitor taskflowId={ taskflowId }
-          clusterId={taskflow.flow.meta ? taskflow.flow.meta.cluster._id : null}
+          clusterId={get(taskflow, 'flow.meta.cluster._id') ? taskflow.flow.meta.cluster._id : null}
         />
         <FileListing title="Input Files" folderId={simulation.metadata.inputFolder._id} actionsDisabled={fileActionsDisabled} />
         <FileListing title="Output Files" folderId={simulation.steps.Visualization.folderId} actionsDisabled={fileActionsDisabled} />