From 912e1b96bfa7d6c022d854fa744f719b49ca98d0 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 21 Jul 2020 15:33:37 +0200 Subject: Add first plotting attempts for portfolios --- frontend/src/containers/app/map/layers/MapLayer.js | 2 +- .../containers/app/map/layers/ObjectHoverLayer.js | 12 +++----- .../containers/app/map/layers/RoomHoverLayer.js | 33 ++++++++-------------- 3 files changed, 17 insertions(+), 30 deletions(-) (limited to 'frontend/src/containers/app/map/layers') diff --git a/frontend/src/containers/app/map/layers/MapLayer.js b/frontend/src/containers/app/map/layers/MapLayer.js index 3c5ff8be..8596cb9c 100644 --- a/frontend/src/containers/app/map/layers/MapLayer.js +++ b/frontend/src/containers/app/map/layers/MapLayer.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux' import MapLayerComponent from '../../../../components/app/map/layers/MapLayerComponent' -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { mapPosition: state.map.position, mapScale: state.map.scale, diff --git a/frontend/src/containers/app/map/layers/ObjectHoverLayer.js b/frontend/src/containers/app/map/layers/ObjectHoverLayer.js index 4619c0b8..a4927862 100644 --- a/frontend/src/containers/app/map/layers/ObjectHoverLayer.js +++ b/frontend/src/containers/app/map/layers/ObjectHoverLayer.js @@ -3,7 +3,7 @@ import { addRackToTile } from '../../../../actions/topology/room' import ObjectHoverLayerComponent from '../../../../components/app/map/layers/ObjectHoverLayerComponent' import { findTileWithPosition } from '../../../../util/tile-calculations' -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { mapPosition: state.map.position, mapScale: state.map.scale, @@ -14,9 +14,7 @@ const mapStateToProps = state => { } const currentRoom = state.objects.room[state.interactionLevel.roomId] - const tiles = currentRoom.tileIds.map( - tileId => state.objects.tile[tileId], - ) + const tiles = currentRoom.tileIds.map((tileId) => state.objects.tile[tileId]) const tile = findTileWithPosition(tiles, x, y) return !(tile === null || tile.rackId) @@ -24,14 +22,12 @@ const mapStateToProps = state => { } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { onClick: (x, y) => dispatch(addRackToTile(x, y)), } } -const ObjectHoverLayer = connect(mapStateToProps, mapDispatchToProps)( - ObjectHoverLayerComponent, -) +const ObjectHoverLayer = connect(mapStateToProps, mapDispatchToProps)(ObjectHoverLayerComponent) export default ObjectHoverLayer diff --git a/frontend/src/containers/app/map/layers/RoomHoverLayer.js b/frontend/src/containers/app/map/layers/RoomHoverLayer.js index 2c886c2f..66404f9e 100644 --- a/frontend/src/containers/app/map/layers/RoomHoverLayer.js +++ b/frontend/src/containers/app/map/layers/RoomHoverLayer.js @@ -7,49 +7,40 @@ import { findPositionInRooms, } from '../../../../util/tile-calculations' -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { mapPosition: state.map.position, mapScale: state.map.scale, isEnabled: () => state.construction.currentRoomInConstruction !== '-1', isValid: (x, y) => { - const newRoom = Object.assign( - {}, - state.objects.room[state.construction.currentRoomInConstruction], - ) + 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])) + .map((id) => Object.assign({}, state.objects.room[id])) .filter( - room => - state.objects.topology[state.currentTopologyId].roomIds.indexOf( - room._id, - ) !== -1 && room._id !== state.construction.currentRoomInConstruction, - ); + (room) => + state.objects.topology[state.currentTopologyId].roomIds.indexOf(room._id) !== -1 && + room._id !== state.construction.currentRoomInConstruction + ) - [...oldRooms, newRoom].forEach(room => { - room.tiles = room.tileIds.map(tileId => state.objects.tile[tileId]) + ;[...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, - ) + const validNextPositions = deriveValidNextTilePositions(oldRooms, newRoom.tiles) return findPositionInPositions(validNextPositions, x, y) !== -1 }, } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { onClick: (x, y) => dispatch(toggleTileAtLocation(x, y)), } } -const RoomHoverLayer = connect(mapStateToProps, mapDispatchToProps)( - RoomHoverLayerComponent, -) +const RoomHoverLayer = connect(mapStateToProps, mapDispatchToProps)(RoomHoverLayerComponent) export default RoomHoverLayer -- cgit v1.2.3