From 8302923a08728d36746af3560ebc35685c2b9da5 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 25 Aug 2017 23:03:05 +0200 Subject: Enable going from building to room and back --- src/components/map/groups/DatacenterGroup.js | 37 +++++++++++++++++++++------- src/components/map/groups/RoomGroup.js | 6 +++-- 2 files changed, 32 insertions(+), 11 deletions(-) (limited to 'src/components/map/groups') diff --git a/src/components/map/groups/DatacenterGroup.js b/src/components/map/groups/DatacenterGroup.js index d7e349be..cd4baaa5 100644 --- a/src/components/map/groups/DatacenterGroup.js +++ b/src/components/map/groups/DatacenterGroup.js @@ -1,23 +1,42 @@ import React from "react"; import {Group} from "react-konva"; +import GrayContainer from "../../../containers/map/GrayContainer"; +import RoomContainer from "../../../containers/map/RoomContainer"; import Shapes from "../../../shapes/index"; -import RoomGroup from "./RoomGroup"; -const DatacenterGroup = ({datacenter}) => { +const DatacenterGroup = ({datacenter, interactionLevel}) => { if (!datacenter) { return ; } - return ( - - {datacenter.rooms.map(room => ( - - ))} - - ); + + if (interactionLevel.mode === "ROOM") { + return ( + + {datacenter.rooms + .filter(room => room.id !== interactionLevel.roomId) + .map(room => ) + } + + {datacenter.rooms + .filter(room => room.id === interactionLevel.roomId) + .map(room => ) + } + + ); + } else { + return ( + + {datacenter.rooms.map(room => ( + + ))} + + ); + } }; DatacenterGroup.propTypes = { datacenter: Shapes.Datacenter, + interactionLevel: Shapes.InteractionLevel, }; export default DatacenterGroup; diff --git a/src/components/map/groups/RoomGroup.js b/src/components/map/groups/RoomGroup.js index 5f349e3c..179a24a2 100644 --- a/src/components/map/groups/RoomGroup.js +++ b/src/components/map/groups/RoomGroup.js @@ -5,8 +5,10 @@ import {deriveWallLocations} from "../../../util/tile-calculations"; import WallSegment from "../elements/WallSegment"; import TileGroup from "./TileGroup"; -const RoomGroup = ({room}) => ( - +const RoomGroup = ({room, onClick}) => ( + {room.tiles.map(tile => ( ))} -- cgit v1.2.3