Restructure component and container directories

3 files changed, 102 insertions, 0 deletions

diff --git a/src/containers/app/map/layers/MapLayer.js b/src/containers/app/map/layers/MapLayer.js
new file mode 100644
index 00000000..ea3a0b57
--- /dev/null
+++ b/src/containers/app/map/layers/MapLayer.js
@@ -0,0 +1,15 @@
+import {connect} from "react-redux";
+import MapLayerComponent from "../../../../components/app/map/layers/MapLayerComponent";
+
+const mapStateToProps = state => {
+    return {
+        mapPosition: state.map.position,
+        mapScale: state.map.scale,
+    };
+};
+
+const MapLayer = connect(
+    mapStateToProps
+)(MapLayerComponent);
+
+export default MapLayer;
diff --git a/src/containers/app/map/layers/ObjectHoverLayer.js b/src/containers/app/map/layers/ObjectHoverLayer.js
new file mode 100644
index 00000000..d905fd42
--- /dev/null
+++ b/src/containers/app/map/layers/ObjectHoverLayer.js
@@ -0,0 +1,37 @@
+import {connect} from "react-redux";
+import {addRackToTile} from "../../../../actions/topology/room";
+import ObjectHoverLayerComponent from "../../../../components/app/map/layers/ObjectHoverLayerComponent";
+import {findTileWithPosition} from "../../../../util/tile-calculations";
+
+const mapStateToProps = state => {
+    return {
+        mapPosition: state.map.position,
+        mapScale: state.map.scale,
+        isEnabled: () => state.construction.inRackConstructionMode,
+        isValid: (x, y) => {
+            if (state.interactionLevel.mode !== "ROOM") {
+                return false;
+            }
+
+            const currentRoom = state.objects.room[state.interactionLevel.roomId];
+            const tiles = currentRoom.tileIds.map(tileId => state.objects.tile[tileId]);
+            const tile = findTileWithPosition(tiles, x, y);
+
+            return !(tile === null || tile.objectType);
+
+        },
+    };
+};
+
+const mapDispatchToProps = dispatch => {
+    return {
+        onClick: (x, y) => dispatch(addRackToTile(x, y)),
+    };
+};
+
+const ObjectHoverLayer = connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(ObjectHoverLayerComponent);
+
+export default ObjectHoverLayer;
diff --git a/src/containers/app/map/layers/RoomHoverLayer.js b/src/containers/app/map/layers/RoomHoverLayer.js
new file mode 100644
index 00000000..801ce549
--- /dev/null
+++ b/src/containers/app/map/layers/RoomHoverLayer.js
@@ -0,0 +1,50 @@
+import {connect} from "react-redux";
+import {toggleTileAtLocation} from "../../../../actions/topology/building";
+import RoomHoverLayerComponent from "../../../../components/app/map/layers/RoomHoverLayerComponent";
+import {
+    deriveValidNextTilePositions,
+    findPositionInPositions,
+    findPositionInRooms
+} from "../../../../util/tile-calculations";
+
+const mapStateToProps = state => {
+    return {
+        mapPosition: state.map.position,
+        mapScale: state.map.scale,
+        isEnabled: () => state.construction.currentRoomInConstruction !== -1,
+        isValid: (x, y) => {
+            if (state.interactionLevel.mode !== "BUILDING") {
+                return false;
+            }
+
+            const newRoom = Object.assign({}, state.objects.room[state.construction.currentRoomInConstruction]);
+            const oldRooms = Object.keys(state.objects.room)
+                .map(id => Object.assign({}, state.objects.room[id]))
+                .filter(room => room.datacenterId === state.currentDatacenterId
+                    && room.id !== state.construction.currentRoomInConstruction);
+
+            [...oldRooms, newRoom].forEach(room => {
+                room.tiles = room.tileIds.map(tileId => state.objects.tile[tileId]);
+            });
+            if (newRoom.tileIds.length === 0) {
+                return findPositionInRooms(oldRooms, x, y) === -1;
+            }
+
+            const validNextPositions = deriveValidNextTilePositions(oldRooms, newRoom.tiles);
+            return findPositionInPositions(validNextPositions, x, y) !== -1;
+        },
+    };
+};
+
+const mapDispatchToProps = dispatch => {
+    return {
+        onClick: (x, y) => dispatch(toggleTileAtLocation(x, y)),
+    };
+};
+
+const RoomHoverLayer = connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(RoomHoverLayerComponent);
+
+export default RoomHoverLayer;