Merge branch 'feature/mongodb-migration' of github.com:atlarge-research/opendc-dev into feature/mongodb-migration

2 files changed, 1 insertions, 36 deletions

diff --git a/frontend/src/containers/app/map/RackContainer.js b/frontend/src/containers/app/map/RackContainer.js
index 34e7bbab..40077608 100644
--- a/frontend/src/containers/app/map/RackContainer.js
+++ b/frontend/src/containers/app/map/RackContainer.js
@@ -1,27 +1,9 @@
 import { connect } from 'react-redux'
 import RackGroup from '../../../components/app/map/groups/RackGroup'
-import { getStateLoad } from '../../../util/simulation-load'
-
-const mapStateToProps = (state, ownProps) => {
-    const inSimulation = state.currentExperimentId !== '-1'
-
-    let rackLoad = undefined
-    if (inSimulation) {
-        if (
-            state.states.rack[state.currentTick] &&
-            state.states.rack[state.currentTick][ownProps.tile.rackId]
-        ) {
-            rackLoad = getStateLoad(
-                state.loadMetric,
-                state.states.rack[state.currentTick][ownProps.tile.rackId],
-            )
-        }
-    }
 
+const mapStateToProps = (state) => {
     return {
         interactionLevel: state.interactionLevel,
-        inSimulation,
-        rackLoad,
     }
 }
 
diff --git a/frontend/src/containers/app/map/TileContainer.js b/frontend/src/containers/app/map/TileContainer.js
index 28289206..ddef097c 100644
--- a/frontend/src/containers/app/map/TileContainer.js
+++ b/frontend/src/containers/app/map/TileContainer.js
@@ -1,30 +1,13 @@
 import { connect } from 'react-redux'
 import { goFromRoomToRack } from '../../../actions/interaction-level'
 import TileGroup from '../../../components/app/map/groups/TileGroup'
-import { getStateLoad } from '../../../util/simulation-load'
 
 const mapStateToProps = (state, ownProps) => {
     const tile = state.objects.tile[ownProps.tileId]
-    const inSimulation = state.currentExperimentId !== '-1'
-
-    let roomLoad = undefined
-    if (inSimulation) {
-        if (
-            state.states.room[state.currentTick] &&
-            state.states.room[state.currentTick][tile.roomId]
-        ) {
-            roomLoad = getStateLoad(
-                state.loadMetric,
-                state.states.room[state.currentTick][tile.roomId],
-            )
-        }
-    }
 
     return {
         interactionLevel: state.interactionLevel,
         tile,
-        inSimulation,
-        roomLoad,
     }
 }