summaryrefslogtreecommitdiff
path: root/frontend/src/containers/app
diff options
context:
space:
mode:
authorGeorgios Andreadis <info@gandreadis.com>2020-07-22 14:07:39 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2020-08-24 19:48:18 +0200
commit92ce9387f5c3ce54b4077ef6a5f604fc2cfe6ade (patch)
tree90432dbd06a13d300f8307dea342f4639c9c57e7 /frontend/src/containers/app
parentae8f03d514ba0982a34b96f1e29e262ca6048a19 (diff)
parent8739a156b75ba96e15d1bb19b08ca829c1eb01e8 (diff)
Merge pull request #12 from atlarge-research/feature/scenario-plots
Plotting of portfolio results
Diffstat (limited to 'frontend/src/containers/app')
-rw-r--r--frontend/src/containers/app/map/GrayContainer.js2
-rw-r--r--frontend/src/containers/app/map/MapStage.js17
-rw-r--r--frontend/src/containers/app/map/RackEnergyFillContainer.js24
-rw-r--r--frontend/src/containers/app/map/RackSpaceFillContainer.js6
-rw-r--r--frontend/src/containers/app/map/TileContainer.js4
-rw-r--r--frontend/src/containers/app/map/TopologyContainer.js2
-rw-r--r--frontend/src/containers/app/map/WallContainer.js4
-rw-r--r--frontend/src/containers/app/map/controls/ScaleIndicatorContainer.js6
-rw-r--r--frontend/src/containers/app/map/controls/ZoomControlContainer.js10
-rw-r--r--frontend/src/containers/app/map/layers/MapLayer.js2
-rw-r--r--frontend/src/containers/app/map/layers/ObjectHoverLayer.js12
-rw-r--r--frontend/src/containers/app/map/layers/RoomHoverLayer.js33
-rw-r--r--frontend/src/containers/app/results/PortfolioResultsContainer.js28
-rw-r--r--frontend/src/containers/app/sidebars/elements/LoadChartContainer.js15
-rw-r--r--frontend/src/containers/app/sidebars/project/PortfolioListContainer.js14
-rw-r--r--frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js4
-rw-r--r--frontend/src/containers/app/sidebars/project/ScenarioListContainer.js18
-rw-r--r--frontend/src/containers/app/sidebars/project/TopologyListContainer.js15
-rw-r--r--frontend/src/containers/app/sidebars/topology/TopologySidebarContainer.js2
-rw-r--r--frontend/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js11
-rw-r--r--frontend/src/containers/app/sidebars/topology/machine/BackToRackContainer.js6
-rw-r--r--frontend/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js6
-rw-r--r--frontend/src/containers/app/sidebars/topology/machine/MachineNameContainer.js2
-rw-r--r--frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js12
-rw-r--r--frontend/src/containers/app/sidebars/topology/machine/UnitAddContainer.js6
-rw-r--r--frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js4
-rw-r--r--frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js8
-rw-r--r--frontend/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js6
-rw-r--r--frontend/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js6
-rw-r--r--frontend/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js4
-rw-r--r--frontend/src/containers/app/sidebars/topology/rack/MachineContainer.js4
-rw-r--r--frontend/src/containers/app/sidebars/topology/rack/MachineListContainer.js7
-rw-r--r--frontend/src/containers/app/sidebars/topology/rack/RackNameContainer.js13
-rw-r--r--frontend/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js2
-rw-r--r--frontend/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js6
-rw-r--r--frontend/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js6
-rw-r--r--frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js8
-rw-r--r--frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js8
-rw-r--r--frontend/src/containers/app/sidebars/topology/room/RoomNameContainer.js8
-rw-r--r--frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js2
40 files changed, 139 insertions, 214 deletions
diff --git a/frontend/src/containers/app/map/GrayContainer.js b/frontend/src/containers/app/map/GrayContainer.js
index 4ae3beac..9e4a6969 100644
--- a/frontend/src/containers/app/map/GrayContainer.js
+++ b/frontend/src/containers/app/map/GrayContainer.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux'
import { goDownOneInteractionLevel } from '../../../actions/interaction-level'
import GrayLayer from '../../../components/app/map/elements/GrayLayer'
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onClick: () => dispatch(goDownOneInteractionLevel()),
}
diff --git a/frontend/src/containers/app/map/MapStage.js b/frontend/src/containers/app/map/MapStage.js
index f749e85a..23c920b6 100644
--- a/frontend/src/containers/app/map/MapStage.js
+++ b/frontend/src/containers/app/map/MapStage.js
@@ -2,26 +2,21 @@ import { connect } from 'react-redux'
import { setMapDimensions, setMapPositionWithBoundsCheck, zoomInOnPosition } from '../../../actions/map'
import MapStageComponent from '../../../components/app/map/MapStageComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
mapPosition: state.map.position,
mapDimensions: state.map.dimensions,
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
- zoomInOnPosition: (zoomIn, x, y) =>
- dispatch(zoomInOnPosition(zoomIn, x, y)),
- setMapPositionWithBoundsCheck: (x, y) =>
- dispatch(setMapPositionWithBoundsCheck(x, y)),
- setMapDimensions: (width, height) =>
- dispatch(setMapDimensions(width, height)),
+ zoomInOnPosition: (zoomIn, x, y) => dispatch(zoomInOnPosition(zoomIn, x, y)),
+ setMapPositionWithBoundsCheck: (x, y) => dispatch(setMapPositionWithBoundsCheck(x, y)),
+ setMapDimensions: (width, height) => dispatch(setMapDimensions(width, height)),
}
}
-const MapStage = connect(mapStateToProps, mapDispatchToProps)(
- MapStageComponent,
-)
+const MapStage = connect(mapStateToProps, mapDispatchToProps)(MapStageComponent)
export default MapStage
diff --git a/frontend/src/containers/app/map/RackEnergyFillContainer.js b/frontend/src/containers/app/map/RackEnergyFillContainer.js
index d5989839..53746271 100644
--- a/frontend/src/containers/app/map/RackEnergyFillContainer.js
+++ b/frontend/src/containers/app/map/RackEnergyFillContainer.js
@@ -5,27 +5,13 @@ const mapStateToProps = (state, ownProps) => {
let energyConsumptionTotal = 0
const rack = state.objects.rack[state.objects.tile[ownProps.tileId].rackId]
const machineIds = rack.machineIds
- machineIds.forEach(machineId => {
+ machineIds.forEach((machineId) => {
if (machineId !== null) {
const machine = state.objects.machine[machineId]
- machine.cpuIds.forEach(
- id =>
- (energyConsumptionTotal += state.objects.cpu[id].energyConsumptionW),
- )
- machine.gpuIds.forEach(
- id =>
- (energyConsumptionTotal += state.objects.gpu[id].energyConsumptionW),
- )
- machine.memoryIds.forEach(
- id =>
- (energyConsumptionTotal +=
- state.objects.memory[id].energyConsumptionW),
- )
- machine.storageIds.forEach(
- id =>
- (energyConsumptionTotal +=
- state.objects.storage[id].energyConsumptionW),
- )
+ machine.cpuIds.forEach((id) => (energyConsumptionTotal += state.objects.cpu[id].energyConsumptionW))
+ machine.gpuIds.forEach((id) => (energyConsumptionTotal += state.objects.gpu[id].energyConsumptionW))
+ machine.memoryIds.forEach((id) => (energyConsumptionTotal += state.objects.memory[id].energyConsumptionW))
+ machine.storageIds.forEach((id) => (energyConsumptionTotal += state.objects.storage[id].energyConsumptionW))
}
})
diff --git a/frontend/src/containers/app/map/RackSpaceFillContainer.js b/frontend/src/containers/app/map/RackSpaceFillContainer.js
index 8110b1fb..0509a5a5 100644
--- a/frontend/src/containers/app/map/RackSpaceFillContainer.js
+++ b/frontend/src/containers/app/map/RackSpaceFillContainer.js
@@ -2,12 +2,10 @@ import { connect } from 'react-redux'
import RackFillBar from '../../../components/app/map/elements/RackFillBar'
const mapStateToProps = (state, ownProps) => {
- const machineIds =
- state.objects.rack[state.objects.tile[ownProps.tileId].rackId].machineIds
+ const machineIds = state.objects.rack[state.objects.tile[ownProps.tileId].rackId].machineIds
return {
type: 'space',
- fillFraction:
- machineIds.filter(id => id !== null).length / machineIds.length,
+ fillFraction: machineIds.filter((id) => id !== null).length / machineIds.length,
}
}
diff --git a/frontend/src/containers/app/map/TileContainer.js b/frontend/src/containers/app/map/TileContainer.js
index ddef097c..04d6c8d6 100644
--- a/frontend/src/containers/app/map/TileContainer.js
+++ b/frontend/src/containers/app/map/TileContainer.js
@@ -11,9 +11,9 @@ const mapStateToProps = (state, ownProps) => {
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
- onClick: tile => {
+ onClick: (tile) => {
if (tile.rackId) {
dispatch(goFromRoomToRack(tile._id))
}
diff --git a/frontend/src/containers/app/map/TopologyContainer.js b/frontend/src/containers/app/map/TopologyContainer.js
index 6f14d6cd..de43a151 100644
--- a/frontend/src/containers/app/map/TopologyContainer.js
+++ b/frontend/src/containers/app/map/TopologyContainer.js
@@ -1,7 +1,7 @@
import { connect } from 'react-redux'
import TopologyGroup from '../../../components/app/map/groups/TopologyGroup'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
if (state.currentTopologyId === '-1') {
return {}
}
diff --git a/frontend/src/containers/app/map/WallContainer.js b/frontend/src/containers/app/map/WallContainer.js
index b288a534..67f8a242 100644
--- a/frontend/src/containers/app/map/WallContainer.js
+++ b/frontend/src/containers/app/map/WallContainer.js
@@ -3,9 +3,7 @@ import WallGroup from '../../../components/app/map/groups/WallGroup'
const mapStateToProps = (state, ownProps) => {
return {
- tiles: state.objects.room[ownProps.roomId].tileIds.map(
- tileId => state.objects.tile[tileId],
- ),
+ tiles: state.objects.room[ownProps.roomId].tileIds.map((tileId) => state.objects.tile[tileId]),
}
}
diff --git a/frontend/src/containers/app/map/controls/ScaleIndicatorContainer.js b/frontend/src/containers/app/map/controls/ScaleIndicatorContainer.js
index 6e443479..fa3b9d22 100644
--- a/frontend/src/containers/app/map/controls/ScaleIndicatorContainer.js
+++ b/frontend/src/containers/app/map/controls/ScaleIndicatorContainer.js
@@ -1,14 +1,12 @@
import { connect } from 'react-redux'
import ScaleIndicatorComponent from '../../../../components/app/map/controls/ScaleIndicatorComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
scale: state.map.scale,
}
}
-const ScaleIndicatorContainer = connect(mapStateToProps)(
- ScaleIndicatorComponent,
-)
+const ScaleIndicatorContainer = connect(mapStateToProps)(ScaleIndicatorComponent)
export default ScaleIndicatorContainer
diff --git a/frontend/src/containers/app/map/controls/ZoomControlContainer.js b/frontend/src/containers/app/map/controls/ZoomControlContainer.js
index 20811989..ddc68cc7 100644
--- a/frontend/src/containers/app/map/controls/ZoomControlContainer.js
+++ b/frontend/src/containers/app/map/controls/ZoomControlContainer.js
@@ -2,20 +2,18 @@ import { connect } from 'react-redux'
import { zoomInOnCenter } from '../../../../actions/map'
import ZoomControlComponent from '../../../../components/app/map/controls/ZoomControlComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
mapScale: state.map.scale,
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
- zoomInOnCenter: zoomIn => dispatch(zoomInOnCenter(zoomIn)),
+ zoomInOnCenter: (zoomIn) => dispatch(zoomInOnCenter(zoomIn)),
}
}
-const ZoomControlContainer = connect(mapStateToProps, mapDispatchToProps)(
- ZoomControlComponent,
-)
+const ZoomControlContainer = connect(mapStateToProps, mapDispatchToProps)(ZoomControlComponent)
export default ZoomControlContainer
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
diff --git a/frontend/src/containers/app/results/PortfolioResultsContainer.js b/frontend/src/containers/app/results/PortfolioResultsContainer.js
new file mode 100644
index 00000000..4b430e54
--- /dev/null
+++ b/frontend/src/containers/app/results/PortfolioResultsContainer.js
@@ -0,0 +1,28 @@
+import { connect } from 'react-redux'
+import PortfolioResultsComponent from '../../../components/app/results/PortfolioResultsComponent'
+
+const mapStateToProps = (state) => {
+ if (
+ state.currentPortfolioId === '-1' ||
+ !state.objects.portfolio[state.currentPortfolioId] ||
+ state.objects.portfolio[state.currentPortfolioId].scenarioIds
+ .map((scenarioId) => state.objects.scenario[scenarioId])
+ .some((s) => s === undefined)
+ ) {
+ return {
+ portfolio: undefined,
+ scenarios: [],
+ }
+ }
+
+ return {
+ portfolio: state.objects.portfolio[state.currentPortfolioId],
+ scenarios: state.objects.portfolio[state.currentPortfolioId].scenarioIds.map(
+ (scenarioId) => state.objects.scenario[scenarioId]
+ ),
+ }
+}
+
+const PortfolioResultsContainer = connect(mapStateToProps)(PortfolioResultsComponent)
+
+export default PortfolioResultsContainer
diff --git a/frontend/src/containers/app/sidebars/elements/LoadChartContainer.js b/frontend/src/containers/app/sidebars/elements/LoadChartContainer.js
deleted file mode 100644
index 61f95932..00000000
--- a/frontend/src/containers/app/sidebars/elements/LoadChartContainer.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { connect } from 'react-redux'
-import LoadChartComponent from '../../../../components/app/sidebars/elements/LoadChartComponent'
-
-const mapStateToProps = (state, ownProps) => {
- const data = []
-
- return {
- data,
- currentTick: state.currentTick,
- }
-}
-
-const LoadChartContainer = connect(mapStateToProps)(LoadChartComponent)
-
-export default LoadChartContainer
diff --git a/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js b/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
index d32a5c60..b32c8b1d 100644
--- a/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
+++ b/frontend/src/containers/app/sidebars/project/PortfolioListContainer.js
@@ -6,11 +6,11 @@ import { openNewPortfolioModal } from '../../../../actions/modals/portfolios'
import { getState } from '../../../../util/state-utils'
import { setCurrentTopology } from '../../../../actions/topology/building'
-const mapStateToProps = state => {
- let portfolios = state.objects.project[state.currentProjectId] ? state.objects.project[state.currentProjectId].portfolioIds.map(t => (
- state.objects.portfolio[t]
- )) : []
- if (portfolios.filter(t => !t).length > 0) {
+const mapStateToProps = (state) => {
+ let portfolios = state.objects.project[state.currentProjectId]
+ ? state.objects.project[state.currentProjectId].portfolioIds.map((t) => state.objects.portfolio[t])
+ : []
+ if (portfolios.filter((t) => !t).length > 0) {
portfolios = []
}
@@ -40,8 +40,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
}
}
-const PortfolioListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(
- PortfolioListComponent,
-))
+const PortfolioListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(PortfolioListComponent))
export default PortfolioListContainer
diff --git a/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js b/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
index 3951c24a..49001099 100644
--- a/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/project/ProjectSidebarContainer.js
@@ -1,10 +1,10 @@
import React from 'react'
import { withRouter } from 'react-router-dom'
import ProjectSidebarComponent from '../../../../components/app/sidebars/project/ProjectSidebarComponent'
+import { isCollapsible } from '../../../../util/sidebar-space'
const ProjectSidebarContainer = withRouter(({ location, ...props }) => (
- <ProjectSidebarComponent
- collapsible={location.pathname.indexOf('portfolios') === -1 && location.pathname.indexOf('scenarios') === -1} {...props}/>
+ <ProjectSidebarComponent collapsible={isCollapsible(location)} {...props} />
))
export default ProjectSidebarContainer
diff --git a/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js b/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
index 2fd56d2b..415e2792 100644
--- a/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
+++ b/frontend/src/containers/app/sidebars/project/ScenarioListContainer.js
@@ -5,10 +5,10 @@ import { deleteScenario, setCurrentScenario } from '../../../../actions/scenario
import { setCurrentPortfolio } from '../../../../actions/portfolios'
const mapStateToProps = (state, ownProps) => {
- let scenarios = state.objects.portfolio[ownProps.portfolioId] ? state.objects.portfolio[ownProps.portfolioId].scenarioIds.map(t => (
- state.objects.scenario[t]
- )) : []
- if (scenarios.filter(t => !t).length > 0) {
+ let scenarios = state.objects.portfolio[ownProps.portfolioId]
+ ? state.objects.portfolio[ownProps.portfolioId].scenarioIds.map((t) => state.objects.scenario[t])
+ : []
+ if (scenarios.filter((t) => !t).length > 0) {
scenarios = []
}
@@ -19,7 +19,7 @@ const mapStateToProps = (state, ownProps) => {
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onNewScenario: (currentPortfolioId) => {
dispatch(setCurrentPortfolio(currentPortfolioId))
@@ -30,16 +30,12 @@ const mapDispatchToProps = dispatch => {
},
onDeleteScenario: (id) => {
if (id) {
- dispatch(
- deleteScenario(id),
- )
+ dispatch(deleteScenario(id))
}
},
}
}
-const ScenarioListContainer = connect(mapStateToProps, mapDispatchToProps)(
- ScenarioListComponent,
-)
+const ScenarioListContainer = connect(mapStateToProps, mapDispatchToProps)(ScenarioListComponent)
export default ScenarioListContainer
diff --git a/frontend/src/containers/app/sidebars/project/TopologyListContainer.js b/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
index 6905c7c5..f65982ef 100644
--- a/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
+++ b/frontend/src/containers/app/sidebars/project/TopologyListContainer.js
@@ -6,18 +6,17 @@ import { withRouter } from 'react-router-dom'
import { getState } from '../../../../util/state-utils'
import { deleteScenario } from '../../../../actions/scenarios'
-const mapStateToProps = state => {
- let topologies = state.objects.project[state.currentProjectId] ? state.objects.project[state.currentProjectId].topologyIds.map(t => (
- state.objects.topology[t]
- )) : []
- if (topologies.filter(t => !t).length > 0) {
+const mapStateToProps = (state) => {
+ let topologies = state.objects.project[state.currentProjectId]
+ ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t])
+ : []
+ if (topologies.filter((t) => !t).length > 0) {
topologies = []
}
return {
currentTopologyId: state.currentTopologyId,
topologies,
-
}
}
@@ -42,8 +41,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
}
}
-const TopologyListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(
- TopologyListComponent,
-))
+const TopologyListContainer = withRouter(connect(mapStateToProps, mapDispatchToProps)(TopologyListComponent))
export default TopologyListContainer
diff --git a/frontend/src/containers/app/sidebars/topology/TopologySidebarContainer.js b/frontend/src/containers/app/sidebars/topology/TopologySidebarContainer.js
index f9bc10bf..fe7c02fd 100644
--- a/frontend/src/containers/app/sidebars/topology/TopologySidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/TopologySidebarContainer.js
@@ -1,7 +1,7 @@
import { connect } from 'react-redux'
import TopologySidebarComponent from '../../../../components/app/sidebars/topology/TopologySidebarComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
interactionLevel: state.interactionLevel,
}
diff --git a/frontend/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js b/frontend/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js
index e1dfdc50..ea9e9e60 100644
--- a/frontend/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js
@@ -4,16 +4,15 @@ import {
finishNewRoomConstruction,
startNewRoomConstruction,
} from '../../../../../actions/topology/building'
-import StartNewRoomConstructionComponent
- from '../../../../../components/app/sidebars/topology/building/NewRoomConstructionComponent'
+import StartNewRoomConstructionComponent from '../../../../../components/app/sidebars/topology/building/NewRoomConstructionComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
currentRoomInConstruction: state.construction.currentRoomInConstruction,
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onStart: () => dispatch(startNewRoomConstruction()),
onFinish: () => dispatch(finishNewRoomConstruction()),
@@ -21,8 +20,6 @@ const mapDispatchToProps = dispatch => {
}
}
-const NewRoomConstructionButton = connect(mapStateToProps, mapDispatchToProps)(
- StartNewRoomConstructionComponent,
-)
+const NewRoomConstructionButton = connect(mapStateToProps, mapDispatchToProps)(StartNewRoomConstructionComponent)
export default NewRoomConstructionButton
diff --git a/frontend/src/containers/app/sidebars/topology/machine/BackToRackContainer.js b/frontend/src/containers/app/sidebars/topology/machine/BackToRackContainer.js
index 61cb79a8..24287ab0 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/BackToRackContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/BackToRackContainer.js
@@ -2,14 +2,12 @@ import { connect } from 'react-redux'
import { goDownOneInteractionLevel } from '../../../../../actions/interaction-level'
import BackToRackComponent from '../../../../../components/app/sidebars/topology/machine/BackToRackComponent'
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onClick: () => dispatch(goDownOneInteractionLevel()),
}
}
-const BackToRackContainer = connect(undefined, mapDispatchToProps)(
- BackToRackComponent,
-)
+const BackToRackContainer = connect(undefined, mapDispatchToProps)(BackToRackComponent)
export default BackToRackContainer
diff --git a/frontend/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js b/frontend/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
index 2dfb0d46..65e683e6 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js
@@ -2,14 +2,12 @@ import { connect } from 'react-redux'
import { openDeleteMachineModal } from '../../../../../actions/modals/topology'
import DeleteMachineComponent from '../../../../../components/app/sidebars/topology/machine/DeleteMachineComponent'
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onClick: () => dispatch(openDeleteMachineModal()),
}
}
-const DeleteMachineContainer = connect(undefined, mapDispatchToProps)(
- DeleteMachineComponent,
-)
+const DeleteMachineContainer = connect(undefined, mapDispatchToProps)(DeleteMachineComponent)
export default DeleteMachineContainer
diff --git a/frontend/src/containers/app/sidebars/topology/machine/MachineNameContainer.js b/frontend/src/containers/app/sidebars/topology/machine/MachineNameContainer.js
index 5c29f85f..1cf35b05 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/MachineNameContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/MachineNameContainer.js
@@ -1,7 +1,7 @@
import { connect } from 'react-redux'
import MachineNameComponent from '../../../../../components/app/sidebars/topology/machine/MachineNameComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
position: state.interactionLevel.position,
}
diff --git a/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js b/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
index 868f26da..b04e3118 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js
@@ -1,17 +1,15 @@
import { connect } from 'react-redux'
import MachineSidebarComponent from '../../../../../components/app/sidebars/topology/machine/MachineSidebarComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
machineId:
- state.objects.rack[
- state.objects.tile[state.interactionLevel.tileId].rackId
- ].machineIds[state.interactionLevel.position - 1],
+ state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].machineIds[
+ state.interactionLevel.position - 1
+ ],
}
}
-const MachineSidebarContainer = connect(mapStateToProps)(
- MachineSidebarComponent,
-)
+const MachineSidebarContainer = connect(mapStateToProps)(MachineSidebarComponent)
export default MachineSidebarContainer
diff --git a/frontend/src/containers/app/sidebars/topology/machine/UnitAddContainer.js b/frontend/src/containers/app/sidebars/topology/machine/UnitAddContainer.js
index 7ff06f4f..29e48016 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/UnitAddContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/UnitAddContainer.js
@@ -10,12 +10,10 @@ const mapStateToProps = (state, ownProps) => {
const mapDispatchToProps = (dispatch, ownProps) => {
return {
- onAdd: id => dispatch(addUnit(ownProps.unitType, id)),
+ onAdd: (id) => dispatch(addUnit(ownProps.unitType, id)),
}
}
-const UnitAddContainer = connect(mapStateToProps, mapDispatchToProps)(
- UnitAddComponent,
-)
+const UnitAddContainer = connect(mapStateToProps, mapDispatchToProps)(UnitAddComponent)
export default UnitAddContainer
diff --git a/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js b/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js
index bd629564..a028ebce 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/UnitContainer.js
@@ -14,8 +14,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
}
}
-const UnitContainer = connect(mapStateToProps, mapDispatchToProps)(
- UnitComponent,
-)
+const UnitContainer = connect(mapStateToProps, mapDispatchToProps)(UnitComponent)
export default UnitContainer
diff --git a/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js b/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js
index e3ad77fd..f382ff74 100644
--- a/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/machine/UnitListContainer.js
@@ -5,10 +5,10 @@ const mapStateToProps = (state, ownProps) => {
return {
unitIds:
state.objects.machine[
- state.objects.rack[
- state.objects.tile[state.interactionLevel.tileId].rackId
- ].machineIds[state.interactionLevel.position - 1]
- ][ownProps.unitType + 'Ids'],
+ state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].machineIds[
+ state.interactionLevel.position - 1
+ ]
+ ][ownProps.unitType + 'Ids'],
}
}
diff --git a/frontend/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js b/frontend/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js
index 35b76d70..58c3b082 100644
--- a/frontend/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js
@@ -2,14 +2,12 @@ import { connect } from 'react-redux'
import { goDownOneInteractionLevel } from '../../../../../actions/interaction-level'
import BackToRoomComponent from '../../../../../components/app/sidebars/topology/rack/BackToRoomComponent'
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onClick: () => dispatch(goDownOneInteractionLevel()),
}
}
-const BackToRoomContainer = connect(undefined, mapDispatchToProps)(
- BackToRoomComponent,
-)
+const BackToRoomContainer = connect(undefined, mapDispatchToProps)(BackToRoomComponent)
export default BackToRoomContainer
diff --git a/frontend/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js b/frontend/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
index b45a419b..8229a359 100644
--- a/frontend/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js
@@ -2,14 +2,12 @@ import { connect } from 'react-redux'
import { openDeleteRackModal } from '../../../../../actions/modals/topology'
import DeleteRackComponent from '../../../../../components/app/sidebars/topology/rack/DeleteRackComponent'
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onClick: () => dispatch(openDeleteRackModal()),
}
}
-const DeleteRackContainer = connect(undefined, mapDispatchToProps)(
- DeleteRackComponent,
-)
+const DeleteRackContainer = connect(undefined, mapDispatchToProps)(DeleteRackComponent)
export default DeleteRackContainer
diff --git a/frontend/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js b/frontend/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js
index ab287bac..cf341da9 100644
--- a/frontend/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js
@@ -8,8 +8,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
}
}
-const EmptySlotContainer = connect(undefined, mapDispatchToProps)(
- EmptySlotComponent,
-)
+const EmptySlotContainer = connect(undefined, mapDispatchToProps)(EmptySlotComponent)
export default EmptySlotContainer
diff --git a/frontend/src/containers/app/sidebars/topology/rack/MachineContainer.js b/frontend/src/containers/app/sidebars/topology/rack/MachineContainer.js
index 6b0f0a04..fe12827d 100644
--- a/frontend/src/containers/app/sidebars/topology/rack/MachineContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/rack/MachineContainer.js
@@ -14,8 +14,6 @@ const mapDispatchToProps = (dispatch, ownProps) => {
}
}
-const MachineContainer = connect(mapStateToProps, mapDispatchToProps)(
- MachineComponent,
-)
+const MachineContainer = connect(mapStateToProps, mapDispatchToProps)(MachineComponent)
export default MachineContainer
diff --git a/frontend/src/containers/app/sidebars/topology/rack/MachineListContainer.js b/frontend/src/containers/app/sidebars/topology/rack/MachineListContainer.js
index 3898d119..bc5a285a 100644
--- a/frontend/src/containers/app/sidebars/topology/rack/MachineListContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/rack/MachineListContainer.js
@@ -1,12 +1,9 @@
import { connect } from 'react-redux'
import MachineListComponent from '../../../../../components/app/sidebars/topology/rack/MachineListComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
- machineIds:
- state.objects.rack[
- state.objects.tile[state.interactionLevel.tileId].rackId
- ].machineIds,
+ machineIds: state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].machineIds,
}
}
diff --git a/frontend/src/containers/app/sidebars/topology/rack/RackNameContainer.js b/frontend/src/containers/app/sidebars/topology/rack/RackNameContainer.js
index 4d8e8936..504dbc61 100644
--- a/frontend/src/containers/app/sidebars/topology/rack/RackNameContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/rack/RackNameContainer.js
@@ -2,23 +2,18 @@ import { connect } from 'react-redux'
import { openEditRackNameModal } from '../../../../../actions/modals/topology'
import RackNameComponent from '../../../../../components/app/sidebars/topology/rack/RackNameComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
- rackName:
- state.objects.rack[
- state.objects.tile[state.interactionLevel.tileId].rackId
- ].name,
+ rackName: state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].name,
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onEdit: () => dispatch(openEditRackNameModal()),
}
}
-const RackNameContainer = connect(mapStateToProps, mapDispatchToProps)(
- RackNameComponent,
-)
+const RackNameContainer = connect(mapStateToProps, mapDispatchToProps)(RackNameComponent)
export default RackNameContainer
diff --git a/frontend/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js b/frontend/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js
index d9be1e8b..453d7e41 100644
--- a/frontend/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js
@@ -1,7 +1,7 @@
import { connect } from 'react-redux'
import RackSidebarComponent from '../../../../../components/app/sidebars/topology/rack/RackSidebarComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
rackId: state.objects.tile[state.interactionLevel.tileId].rackId,
}
diff --git a/frontend/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js b/frontend/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js
index bf4ecbb5..4c1ab99d 100644
--- a/frontend/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js
@@ -2,14 +2,12 @@ import { connect } from 'react-redux'
import { goDownOneInteractionLevel } from '../../../../../actions/interaction-level'
import BackToBuildingComponent from '../../../../../components/app/sidebars/topology/room/BackToBuildingComponent'
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onClick: () => dispatch(goDownOneInteractionLevel()),
}
}
-const BackToBuildingContainer = connect(undefined, mapDispatchToProps)(
- BackToBuildingComponent,
-)
+const BackToBuildingContainer = connect(undefined, mapDispatchToProps)(BackToBuildingComponent)
export default BackToBuildingContainer
diff --git a/frontend/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js b/frontend/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
index 0f699888..636fa5c5 100644
--- a/frontend/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js
@@ -2,14 +2,12 @@ import { connect } from 'react-redux'
import { openDeleteRoomModal } from '../../../../../actions/modals/topology'
import DeleteRoomComponent from '../../../../../components/app/sidebars/topology/room/DeleteRoomComponent'
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onClick: () => dispatch(openDeleteRoomModal()),
}
}
-const DeleteRoomContainer = connect(undefined, mapDispatchToProps)(
- DeleteRoomComponent,
-)
+const DeleteRoomContainer = connect(undefined, mapDispatchToProps)(DeleteRoomComponent)
export default DeleteRoomContainer
diff --git a/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js b/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js
index 227938fa..d17a45d1 100644
--- a/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js
@@ -2,22 +2,20 @@ import { connect } from 'react-redux'
import { finishRoomEdit, startRoomEdit } from '../../../../../actions/topology/building'
import EditRoomComponent from '../../../../../components/app/sidebars/topology/room/EditRoomComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
isEditing: state.construction.currentRoomInConstruction !== '-1',
isInRackConstructionMode: state.construction.inRackConstructionMode,
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onEdit: () => dispatch(startRoomEdit()),
onFinish: () => dispatch(finishRoomEdit()),
}
}
-const EditRoomContainer = connect(mapStateToProps, mapDispatchToProps)(
- EditRoomComponent,
-)
+const EditRoomContainer = connect(mapStateToProps, mapDispatchToProps)(EditRoomComponent)
export default EditRoomContainer
diff --git a/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js b/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js
index 17a30d20..cd8319de 100644
--- a/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js
@@ -2,22 +2,20 @@ import { connect } from 'react-redux'
import { startRackConstruction, stopRackConstruction } from '../../../../../actions/topology/room'
import RackConstructionComponent from '../../../../../components/app/sidebars/topology/room/RackConstructionComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
inRackConstructionMode: state.construction.inRackConstructionMode,
isEditingRoom: state.construction.currentRoomInConstruction !== '-1',
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onStart: () => dispatch(startRackConstruction()),
onStop: () => dispatch(stopRackConstruction()),
}
}
-const RackConstructionContainer = connect(mapStateToProps, mapDispatchToProps)(
- RackConstructionComponent,
-)
+const RackConstructionContainer = connect(mapStateToProps, mapDispatchToProps)(RackConstructionComponent)
export default RackConstructionContainer
diff --git a/frontend/src/containers/app/sidebars/topology/room/RoomNameContainer.js b/frontend/src/containers/app/sidebars/topology/room/RoomNameContainer.js
index dae7dcc0..cab16016 100644
--- a/frontend/src/containers/app/sidebars/topology/room/RoomNameContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/room/RoomNameContainer.js
@@ -2,20 +2,18 @@ import { connect } from 'react-redux'
import { openEditRoomNameModal } from '../../../../../actions/modals/topology'
import RoomNameComponent from '../../../../../components/app/sidebars/topology/room/RoomNameComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
roomName: state.objects.room[state.interactionLevel.roomId].name,
}
}
-const mapDispatchToProps = dispatch => {
+const mapDispatchToProps = (dispatch) => {
return {
onEdit: () => dispatch(openEditRoomNameModal()),
}
}
-const RoomNameContainer = connect(mapStateToProps, mapDispatchToProps)(
- RoomNameComponent,
-)
+const RoomNameContainer = connect(mapStateToProps, mapDispatchToProps)(RoomNameComponent)
export default RoomNameContainer
diff --git a/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js b/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js
index a95e290d..8c3ca8ab 100644
--- a/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js
+++ b/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js
@@ -1,7 +1,7 @@
import { connect } from 'react-redux'
import RoomSidebarComponent from '../../../../../components/app/sidebars/topology/room/RoomSidebarComponent'
-const mapStateToProps = state => {
+const mapStateToProps = (state) => {
return {
roomId: state.interactionLevel.roomId,
}