1 files changed, 14 insertions, 1 deletions
diff --git a/src/containers/sidebars/topology/rack/MachineContainer.js b/src/containers/sidebars/topology/rack/MachineContainer.js
index 21ab06c4..7406d191 100644
--- a/src/containers/sidebars/topology/rack/MachineContainer.js
+++ b/src/containers/sidebars/topology/rack/MachineContainer.js
@@ -1,10 +1,23 @@
 import {connect} from "react-redux";
 import {goFromRackToMachine} from "../../../../actions/interaction-level";
 import MachineComponent from "../../../../components/sidebars/topology/rack/MachineComponent";
+import {getStateLoad} from "../../../../util/simulation-load";
 
 const mapStateToProps = (state, ownProps) => {
+    const machine = state.objects.machine[ownProps.machineId];
+    const inSimulation = state.currentExperimentId !== -1;
+
+    let machineLoad = undefined;
+    if (inSimulation) {
+        if (state.states.machine[state.currentTick] && state.states.machine[state.currentTick][machine.id]) {
+            machineLoad = getStateLoad(state.loadMetric, state.states.machine[state.currentTick][machine.id]);
+        }
+    }
+
     return {
-        machine: state.objects.machine[ownProps.machineId],
+        machine,
+        inSimulation,
+        machineLoad
     };
 };