summaryrefslogtreecommitdiff
path: root/frontend/src/components/app/map
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src/components/app/map')
-rw-r--r--frontend/src/components/app/map/groups/RackGroup.js12
-rw-r--r--frontend/src/components/app/map/groups/TileGroup.js5
2 files changed, 4 insertions, 13 deletions
diff --git a/frontend/src/components/app/map/groups/RackGroup.js b/frontend/src/components/app/map/groups/RackGroup.js
index 6de939a9..5d4ee5e2 100644
--- a/frontend/src/components/app/map/groups/RackGroup.js
+++ b/frontend/src/components/app/map/groups/RackGroup.js
@@ -4,23 +4,17 @@ import RackEnergyFillContainer from '../../../../containers/app/map/RackEnergyFi
import RackSpaceFillContainer from '../../../../containers/app/map/RackSpaceFillContainer'
import Shapes from '../../../../shapes/index'
import { RACK_BACKGROUND_COLOR } from '../../../../util/colors'
-import { convertLoadToSimulationColor } from '../../../../util/simulation-load'
import TileObject from '../elements/TileObject'
-const RackGroup = ({ tile, inSimulation, rackLoad }) => {
- let color = RACK_BACKGROUND_COLOR
- if (inSimulation && rackLoad >= 0) {
- color = convertLoadToSimulationColor(rackLoad)
- }
-
+const RackGroup = ({ tile }) => {
return (
<Group>
<TileObject
positionX={tile.positionX}
positionY={tile.positionY}
- color={color}
+ color={RACK_BACKGROUND_COLOR}
/>
- <Group opacity={inSimulation ? 0.3 : 1}>
+ <Group>
<RackSpaceFillContainer
tileId={tile._id}
positionX={tile.positionX}
diff --git a/frontend/src/components/app/map/groups/TileGroup.js b/frontend/src/components/app/map/groups/TileGroup.js
index 54f4ae17..e984f05b 100644
--- a/frontend/src/components/app/map/groups/TileGroup.js
+++ b/frontend/src/components/app/map/groups/TileGroup.js
@@ -4,10 +4,9 @@ import { Group } from 'react-konva'
import RackContainer from '../../../../containers/app/map/RackContainer'
import Shapes from '../../../../shapes/index'
import { ROOM_DEFAULT_COLOR, ROOM_IN_CONSTRUCTION_COLOR } from '../../../../util/colors'
-import { convertLoadToSimulationColor } from '../../../../util/simulation-load'
import RoomTile from '../elements/RoomTile'
-const TileGroup = ({ tile, newTile, inSimulation, roomLoad, onClick }) => {
+const TileGroup = ({ tile, newTile, roomLoad, onClick }) => {
let tileObject
if (tile.rackId) {
tileObject = <RackContainer tile={tile}/>
@@ -18,8 +17,6 @@ const TileGroup = ({ tile, newTile, inSimulation, roomLoad, onClick }) => {
let color = ROOM_DEFAULT_COLOR
if (newTile) {
color = ROOM_IN_CONSTRUCTION_COLOR
- } else if (inSimulation && roomLoad >= 0) {
- color = convertLoadToSimulationColor(roomLoad)
}
return (