summaryrefslogtreecommitdiff
path: root/frontend/src/containers/app/map
diff options
context:
space:
mode:
authorGeorgios Andreadis <info@gandreadis.com>2020-07-03 11:46:29 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2020-08-24 19:47:22 +0200
commit52865c97f820b883977179930ce4961abdb39c12 (patch)
tree6b429d80694d7e5729fb1f41ff8f9ba4b2d07d4b /frontend/src/containers/app/map
parent39277c91281dbc7bd40bdffabc5b5675e9ede483 (diff)
Fix integer IDs and topology deletion
Diffstat (limited to 'frontend/src/containers/app/map')
-rw-r--r--frontend/src/containers/app/map/RackContainer.js2
-rw-r--r--frontend/src/containers/app/map/TileContainer.js2
-rw-r--r--frontend/src/containers/app/map/TopologyContainer.js2
-rw-r--r--frontend/src/containers/app/map/layers/RoomHoverLayer.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/frontend/src/containers/app/map/RackContainer.js b/frontend/src/containers/app/map/RackContainer.js
index 362ba2e2..34e7bbab 100644
--- a/frontend/src/containers/app/map/RackContainer.js
+++ b/frontend/src/containers/app/map/RackContainer.js
@@ -3,7 +3,7 @@ import RackGroup from '../../../components/app/map/groups/RackGroup'
import { getStateLoad } from '../../../util/simulation-load'
const mapStateToProps = (state, ownProps) => {
- const inSimulation = state.currentExperimentId !== -1
+ const inSimulation = state.currentExperimentId !== '-1'
let rackLoad = undefined
if (inSimulation) {
diff --git a/frontend/src/containers/app/map/TileContainer.js b/frontend/src/containers/app/map/TileContainer.js
index 7d9f7754..28289206 100644
--- a/frontend/src/containers/app/map/TileContainer.js
+++ b/frontend/src/containers/app/map/TileContainer.js
@@ -5,7 +5,7 @@ import { getStateLoad } from '../../../util/simulation-load'
const mapStateToProps = (state, ownProps) => {
const tile = state.objects.tile[ownProps.tileId]
- const inSimulation = state.currentExperimentId !== -1
+ const inSimulation = state.currentExperimentId !== '-1'
let roomLoad = undefined
if (inSimulation) {
diff --git a/frontend/src/containers/app/map/TopologyContainer.js b/frontend/src/containers/app/map/TopologyContainer.js
index 37cc5a06..6f14d6cd 100644
--- a/frontend/src/containers/app/map/TopologyContainer.js
+++ b/frontend/src/containers/app/map/TopologyContainer.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux'
import TopologyGroup from '../../../components/app/map/groups/TopologyGroup'
const mapStateToProps = state => {
- if (state.currentTopologyId === -1) {
+ if (state.currentTopologyId === '-1') {
return {}
}
diff --git a/frontend/src/containers/app/map/layers/RoomHoverLayer.js b/frontend/src/containers/app/map/layers/RoomHoverLayer.js
index c05627ea..2c886c2f 100644
--- a/frontend/src/containers/app/map/layers/RoomHoverLayer.js
+++ b/frontend/src/containers/app/map/layers/RoomHoverLayer.js
@@ -11,7 +11,7 @@ const mapStateToProps = state => {
return {
mapPosition: state.map.position,
mapScale: state.map.scale,
- isEnabled: () => state.construction.currentRoomInConstruction !== -1,
+ isEnabled: () => state.construction.currentRoomInConstruction !== '-1',
isValid: (x, y) => {
const newRoom = Object.assign(
{},