diff options
| author | Georgios Andreadis <info@gandreadis.com> | 2020-07-02 18:39:28 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:47:21 +0200 |
| commit | f119fc78dda4d1e828dde04f378a63a93e3a0a7e (patch) | |
| tree | bea1eace5d47f21a7ccb835c6a6079bc92e48710 /frontend/src/containers/app/map/layers | |
| parent | 7f27a6370a0af25e1bf6ff8f46360c6c26c21e0b (diff) | |
Add current progress on frontend port
Diffstat (limited to 'frontend/src/containers/app/map/layers')
| -rw-r--r-- | frontend/src/containers/app/map/layers/ObjectHoverLayer.js | 2 | ||||
| -rw-r--r-- | frontend/src/containers/app/map/layers/RoomHoverLayer.js | 6 |
2 files changed, 4 insertions, 4 deletions
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 => { |