diff options
| author | Georgios Andreadis <info@gandreadis.com> | 2020-07-07 09:55:10 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:47:25 +0200 |
| commit | b4bdf9fde013bb7ff9579693b64ff575f7b00e44 (patch) | |
| tree | 5e05ceba918849391a639bbeeab37d290a86523c /frontend/src/containers/app/map | |
| parent | 7331e9baf2cfe7bdfb24effcf0a4801da1e7ea4d (diff) | |
Rename simulations to projects and remove experiment view
Diffstat (limited to 'frontend/src/containers/app/map')
| -rw-r--r-- | frontend/src/containers/app/map/RackContainer.js | 20 | ||||
| -rw-r--r-- | frontend/src/containers/app/map/TileContainer.js | 17 |
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, } } |
