summaryrefslogtreecommitdiff
path: root/src/components/app
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-28 22:48:38 +0200
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-28 22:48:38 +0200
commitbcf119f2c4ac587cc8263db8a9fc0581521fdec7 (patch)
treec7c78a13d575b8345d729bb5aa44022d7f0715d4 /src/components/app
parentf29305d4c966af83a0a842f78dcb7adb7128b37c (diff)
Implement batch state adding
Also fixes the 'hidden states' bug.
Diffstat (limited to 'src/components/app')
-rw-r--r--src/components/app/map/groups/RackGroup.js2
-rw-r--r--src/components/app/map/groups/TileGroup.js2
-rw-r--r--src/components/app/sidebars/topology/rack/MachineComponent.js2
-rw-r--r--src/components/app/timeline/Timeline.sass2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/components/app/map/groups/RackGroup.js b/src/components/app/map/groups/RackGroup.js
index 233d0c20..b31575a6 100644
--- a/src/components/app/map/groups/RackGroup.js
+++ b/src/components/app/map/groups/RackGroup.js
@@ -9,7 +9,7 @@ import TileObject from "../elements/TileObject";
const RackGroup = ({tile, inSimulation, rackLoad}) => {
let color = RACK_BACKGROUND_COLOR;
- if (inSimulation && rackLoad) {
+ if (inSimulation && rackLoad >= 0) {
color = convertLoadToSimulationColor(rackLoad);
}
diff --git a/src/components/app/map/groups/TileGroup.js b/src/components/app/map/groups/TileGroup.js
index c41e78a4..0cd4ea59 100644
--- a/src/components/app/map/groups/TileGroup.js
+++ b/src/components/app/map/groups/TileGroup.js
@@ -20,7 +20,7 @@ const TileGroup = ({tile, newTile, inSimulation, roomLoad, onClick}) => {
let color = ROOM_DEFAULT_COLOR;
if (newTile) {
color = ROOM_IN_CONSTRUCTION_COLOR;
- } else if (inSimulation && roomLoad) {
+ } else if (inSimulation && roomLoad >= 0) {
color = convertLoadToSimulationColor(roomLoad);
}
diff --git a/src/components/app/sidebars/topology/rack/MachineComponent.js b/src/components/app/sidebars/topology/rack/MachineComponent.js
index 545bb916..0ba4503d 100644
--- a/src/components/app/sidebars/topology/rack/MachineComponent.js
+++ b/src/components/app/sidebars/topology/rack/MachineComponent.js
@@ -15,7 +15,7 @@ const UnitIcon = ({id, type}) => (
const MachineComponent = ({position, machine, inSimulation, machineLoad, onClick}) => {
let color = "white";
- if (inSimulation && machineLoad) {
+ if (inSimulation && machineLoad >= 0) {
color = convertLoadToSimulationColor(machineLoad);
}
const hasNoUnits = machine.cpuIds.length + machine.gpuIds.length + machine.memoryIds.length
diff --git a/src/components/app/timeline/Timeline.sass b/src/components/app/timeline/Timeline.sass
index 5003e80d..a5485bfd 100644
--- a/src/components/app/timeline/Timeline.sass
+++ b/src/components/app/timeline/Timeline.sass
@@ -110,3 +110,5 @@ $timeline-border: $border-width solid $gray-semi-dark
background: #222222
z-index: 504
+
+ pointer-events: none