Add current progress on frontend port

9 files changed, 28 insertions, 32 deletions

diff --git a/frontend/src/containers/app/map/DatacenterContainer.js b/frontend/src/containers/app/map/DatacenterContainer.js
deleted file mode 100644
index 9ed1d38c..00000000
--- a/frontend/src/containers/app/map/DatacenterContainer.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { connect } from 'react-redux'
-import DatacenterGroup from '../../../components/app/map/groups/DatacenterGroup'
-
-const mapStateToProps = state => {
-    if (state.currentDatacenterId === -1) {
-        return {}
-    }
-
-    return {
-        datacenter: state.objects.datacenter[state.currentDatacenterId],
-        interactionLevel: state.interactionLevel,
-    }
-}
-
-const DatacenterContainer = connect(mapStateToProps)(DatacenterGroup)
-
-export default DatacenterContainer
diff --git a/frontend/src/containers/app/map/MapStage.js b/frontend/src/containers/app/map/MapStage.js
index e8abb86f..f749e85a 100644
--- a/frontend/src/containers/app/map/MapStage.js
+++ b/frontend/src/containers/app/map/MapStage.js
@@ -1,9 +1,5 @@
 import { connect } from 'react-redux'
-import {
-    setMapDimensions,
-    setMapPositionWithBoundsCheck,
-    zoomInOnPosition,
-} from '../../../actions/map'
+import { setMapDimensions, setMapPositionWithBoundsCheck, zoomInOnPosition } from '../../../actions/map'
 import MapStageComponent from '../../../components/app/map/MapStageComponent'
 
 const mapStateToProps = state => {
diff --git a/frontend/src/containers/app/map/RackContainer.js b/frontend/src/containers/app/map/RackContainer.js
index 614421b4..362ba2e2 100644
--- a/frontend/src/containers/app/map/RackContainer.js
+++ b/frontend/src/containers/app/map/RackContainer.js
@@ -9,11 +9,11 @@ const mapStateToProps = (state, ownProps) => {
     if (inSimulation) {
         if (
             state.states.rack[state.currentTick] &&
-            state.states.rack[state.currentTick][ownProps.tile.objectId]
+            state.states.rack[state.currentTick][ownProps.tile.rackId]
         ) {
             rackLoad = getStateLoad(
                 state.loadMetric,
-                state.states.rack[state.currentTick][ownProps.tile.objectId],
+                state.states.rack[state.currentTick][ownProps.tile.rackId],
             )
         }
     }
diff --git a/frontend/src/containers/app/map/RackEnergyFillContainer.js b/frontend/src/containers/app/map/RackEnergyFillContainer.js
index e25cd37d..d5989839 100644
--- a/frontend/src/containers/app/map/RackEnergyFillContainer.js
+++ b/frontend/src/containers/app/map/RackEnergyFillContainer.js
@@ -3,7 +3,7 @@ import RackFillBar from '../../../components/app/map/elements/RackFillBar'
 
 const mapStateToProps = (state, ownProps) => {
     let energyConsumptionTotal = 0
-    const rack = state.objects.rack[state.objects.tile[ownProps.tileId].objectId]
+    const rack = state.objects.rack[state.objects.tile[ownProps.tileId].rackId]
     const machineIds = rack.machineIds
     machineIds.forEach(machineId => {
         if (machineId !== null) {
diff --git a/frontend/src/containers/app/map/RackSpaceFillContainer.js b/frontend/src/containers/app/map/RackSpaceFillContainer.js
index c43695a9..8110b1fb 100644
--- a/frontend/src/containers/app/map/RackSpaceFillContainer.js
+++ b/frontend/src/containers/app/map/RackSpaceFillContainer.js
@@ -3,7 +3,7 @@ import RackFillBar from '../../../components/app/map/elements/RackFillBar'
 
 const mapStateToProps = (state, ownProps) => {
     const machineIds =
-        state.objects.rack[state.objects.tile[ownProps.tileId].objectId].machineIds
+        state.objects.rack[state.objects.tile[ownProps.tileId].rackId].machineIds
     return {
         type: 'space',
         fillFraction:
diff --git a/frontend/src/containers/app/map/TileContainer.js b/frontend/src/containers/app/map/TileContainer.js
index 6122be96..7d9f7754 100644
--- a/frontend/src/containers/app/map/TileContainer.js
+++ b/frontend/src/containers/app/map/TileContainer.js
@@ -31,8 +31,8 @@ const mapStateToProps = (state, ownProps) => {
 const mapDispatchToProps = dispatch => {
     return {
         onClick: tile => {
-            if (tile.objectType) {
-                dispatch(goFromRoomToRack(tile.id))
+            if (tile.rackId) {
+                dispatch(goFromRoomToRack(tile._id))
             }
         },
     }
diff --git a/frontend/src/containers/app/map/TopologyContainer.js b/frontend/src/containers/app/map/TopologyContainer.js
new file mode 100644
index 00000000..37cc5a06
--- /dev/null
+++ b/frontend/src/containers/app/map/TopologyContainer.js
@@ -0,0 +1,17 @@
+import { connect } from 'react-redux'
+import TopologyGroup from '../../../components/app/map/groups/TopologyGroup'
+
+const mapStateToProps = state => {
+    if (state.currentTopologyId === -1) {
+        return {}
+    }
+
+    return {
+        topology: state.objects.topology[state.currentTopologyId],
+        interactionLevel: state.interactionLevel,
+    }
+}
+
+const TopologyContainer = connect(mapStateToProps)(TopologyGroup)
+
+export default TopologyContainer
diff --git a/frontend/src/containers/app/map/layers/ObjectHoverLayer.js b/frontend/src/containers/app/map/layers/ObjectHoverLayer.js
index dc489e82..4619c0b8 100644
--- a/frontend/src/containers/app/map/layers/ObjectHoverLayer.js
+++ b/frontend/src/containers/app/map/layers/ObjectHoverLayer.js
@@ -19,7 +19,7 @@ const mapStateToProps = state => {
             )
             const tile = findTileWithPosition(tiles, x, y)
 
-            return !(tile === null || tile.objectType)
+            return !(tile === null || tile.rackId)
         },
     }
 }
diff --git a/frontend/src/containers/app/map/layers/RoomHoverLayer.js b/frontend/src/containers/app/map/layers/RoomHoverLayer.js
index b5a891ce..c05627ea 100644
--- a/frontend/src/containers/app/map/layers/RoomHoverLayer.js
+++ b/frontend/src/containers/app/map/layers/RoomHoverLayer.js
@@ -21,9 +21,9 @@ const mapStateToProps = state => {
                 .map(id => Object.assign({}, state.objects.room[id]))
                 .filter(
                     room =>
-                        state.objects.datacenter[state.currentDatacenterId].roomIds.indexOf(
-                            room.id,
-                        ) !== -1 && room.id !== state.construction.currentRoomInConstruction,
+                        state.objects.topology[state.currentTopologyId].roomIds.indexOf(
+                            room._id,
+                        ) !== -1 && room._id !== state.construction.currentRoomInConstruction,
                 );
 
             [...oldRooms, newRoom].forEach(room => {