diff options
Diffstat (limited to 'src/containers')
67 files changed, 0 insertions, 1679 deletions
diff --git a/src/containers/app/map/DatacenterContainer.js b/src/containers/app/map/DatacenterContainer.js deleted file mode 100644 index 125739f3..00000000 --- a/src/containers/app/map/DatacenterContainer.js +++ /dev/null @@ -1,17 +0,0 @@ -import { connect } from "react-redux"; -import DatacenterGroup from "../../../components/app/map/groups/DatacenterGroup"; - -const mapStateToProps = state => { - if (state.currentDatacenterId === -1) { - return {}; - } - - return { - datacenter: state.objects.datacenter[state.currentDatacenterId], - interactionLevel: state.interactionLevel - }; -}; - -const DatacenterContainer = connect(mapStateToProps)(DatacenterGroup); - -export default DatacenterContainer; diff --git a/src/containers/app/map/GrayContainer.js b/src/containers/app/map/GrayContainer.js deleted file mode 100644 index d215bf6c..00000000 --- a/src/containers/app/map/GrayContainer.js +++ /dev/null @@ -1,13 +0,0 @@ -import { connect } from "react-redux"; -import { goDownOneInteractionLevel } from "../../../actions/interaction-level"; -import GrayLayer from "../../../components/app/map/elements/GrayLayer"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(goDownOneInteractionLevel()) - }; -}; - -const GrayContainer = connect(undefined, mapDispatchToProps)(GrayLayer); - -export default GrayContainer; diff --git a/src/containers/app/map/MapStage.js b/src/containers/app/map/MapStage.js deleted file mode 100644 index a8467171..00000000 --- a/src/containers/app/map/MapStage.js +++ /dev/null @@ -1,31 +0,0 @@ -import { connect } from "react-redux"; -import { - setMapDimensions, - setMapPositionWithBoundsCheck, - zoomInOnPosition -} from "../../../actions/map"; -import MapStageComponent from "../../../components/app/map/MapStageComponent"; - -const mapStateToProps = state => { - return { - mapPosition: state.map.position, - mapDimensions: state.map.dimensions - }; -}; - -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)) - }; -}; - -const MapStage = connect(mapStateToProps, mapDispatchToProps)( - MapStageComponent -); - -export default MapStage; diff --git a/src/containers/app/map/RackContainer.js b/src/containers/app/map/RackContainer.js deleted file mode 100644 index 365bb062..00000000 --- a/src/containers/app/map/RackContainer.js +++ /dev/null @@ -1,30 +0,0 @@ -import { connect } from "react-redux"; -import RackGroup from "../../../components/app/map/groups/RackGroup"; -import { getStateLoad } from "../../../util/simulation-load"; - -const mapStateToProps = (state, ownProps) => { - const inSimulation = state.currentExperimentId !== -1; - - let rackLoad = undefined; - if (inSimulation) { - if ( - state.states.rack[state.currentTick] && - state.states.rack[state.currentTick][ownProps.tile.objectId] - ) { - rackLoad = getStateLoad( - state.loadMetric, - state.states.rack[state.currentTick][ownProps.tile.objectId] - ); - } - } - - return { - interactionLevel: state.interactionLevel, - inSimulation, - rackLoad - }; -}; - -const RackContainer = connect(mapStateToProps)(RackGroup); - -export default RackContainer; diff --git a/src/containers/app/map/RackEnergyFillContainer.js b/src/containers/app/map/RackEnergyFillContainer.js deleted file mode 100644 index 0b7921d9..00000000 --- a/src/containers/app/map/RackEnergyFillContainer.js +++ /dev/null @@ -1,40 +0,0 @@ -import { connect } from "react-redux"; -import RackFillBar from "../../../components/app/map/elements/RackFillBar"; - -const mapStateToProps = (state, ownProps) => { - let energyConsumptionTotal = 0; - const rack = state.objects.rack[state.objects.tile[ownProps.tileId].objectId]; - const machineIds = rack.machineIds; - 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) - ); - } - }); - - return { - type: "energy", - fillFraction: Math.min(1, energyConsumptionTotal / rack.powerCapacityW) - }; -}; - -const RackSpaceFillContainer = connect(mapStateToProps)(RackFillBar); - -export default RackSpaceFillContainer; diff --git a/src/containers/app/map/RackSpaceFillContainer.js b/src/containers/app/map/RackSpaceFillContainer.js deleted file mode 100644 index cc4d1251..00000000 --- a/src/containers/app/map/RackSpaceFillContainer.js +++ /dev/null @@ -1,16 +0,0 @@ -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].objectId].machineIds; - return { - type: "space", - fillFraction: - machineIds.filter(id => id !== null).length / machineIds.length - }; -}; - -const RackSpaceFillContainer = connect(mapStateToProps)(RackFillBar); - -export default RackSpaceFillContainer; diff --git a/src/containers/app/map/RoomContainer.js b/src/containers/app/map/RoomContainer.js deleted file mode 100644 index b83c7fa0..00000000 --- a/src/containers/app/map/RoomContainer.js +++ /dev/null @@ -1,21 +0,0 @@ -import { connect } from "react-redux"; -import { goFromBuildingToRoom } from "../../../actions/interaction-level"; -import RoomGroup from "../../../components/app/map/groups/RoomGroup"; - -const mapStateToProps = (state, ownProps) => { - return { - interactionLevel: state.interactionLevel, - currentRoomInConstruction: state.construction.currentRoomInConstruction, - room: state.objects.room[ownProps.roomId] - }; -}; - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onClick: () => dispatch(goFromBuildingToRoom(ownProps.roomId)) - }; -}; - -const RoomContainer = connect(mapStateToProps, mapDispatchToProps)(RoomGroup); - -export default RoomContainer; diff --git a/src/containers/app/map/TileContainer.js b/src/containers/app/map/TileContainer.js deleted file mode 100644 index 9e179924..00000000 --- a/src/containers/app/map/TileContainer.js +++ /dev/null @@ -1,43 +0,0 @@ -import { connect } from "react-redux"; -import { goFromRoomToRack } from "../../../actions/interaction-level"; -import TileGroup from "../../../components/app/map/groups/TileGroup"; -import { getStateLoad } from "../../../util/simulation-load"; - -const mapStateToProps = (state, ownProps) => { - const tile = state.objects.tile[ownProps.tileId]; - const inSimulation = state.currentExperimentId !== -1; - - let roomLoad = undefined; - if (inSimulation) { - if ( - state.states.room[state.currentTick] && - state.states.room[state.currentTick][tile.roomId] - ) { - roomLoad = getStateLoad( - state.loadMetric, - state.states.room[state.currentTick][tile.roomId] - ); - } - } - - return { - interactionLevel: state.interactionLevel, - tile, - inSimulation, - roomLoad - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onClick: tile => { - if (tile.objectType) { - dispatch(goFromRoomToRack(tile.id)); - } - } - }; -}; - -const TileContainer = connect(mapStateToProps, mapDispatchToProps)(TileGroup); - -export default TileContainer; diff --git a/src/containers/app/map/WallContainer.js b/src/containers/app/map/WallContainer.js deleted file mode 100644 index 38192b05..00000000 --- a/src/containers/app/map/WallContainer.js +++ /dev/null @@ -1,14 +0,0 @@ -import { connect } from "react-redux"; -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] - ) - }; -}; - -const WallContainer = connect(mapStateToProps)(WallGroup); - -export default WallContainer; diff --git a/src/containers/app/map/controls/ScaleIndicatorContainer.js b/src/containers/app/map/controls/ScaleIndicatorContainer.js deleted file mode 100644 index f075cde5..00000000 --- a/src/containers/app/map/controls/ScaleIndicatorContainer.js +++ /dev/null @@ -1,14 +0,0 @@ -import { connect } from "react-redux"; -import ScaleIndicatorComponent from "../../../../components/app/map/controls/ScaleIndicatorComponent"; - -const mapStateToProps = state => { - return { - scale: state.map.scale - }; -}; - -const ScaleIndicatorContainer = connect(mapStateToProps)( - ScaleIndicatorComponent -); - -export default ScaleIndicatorContainer; diff --git a/src/containers/app/map/controls/ZoomControlContainer.js b/src/containers/app/map/controls/ZoomControlContainer.js deleted file mode 100644 index 50910bd6..00000000 --- a/src/containers/app/map/controls/ZoomControlContainer.js +++ /dev/null @@ -1,21 +0,0 @@ -import { connect } from "react-redux"; -import { zoomInOnCenter } from "../../../../actions/map"; -import ZoomControlComponent from "../../../../components/app/map/controls/ZoomControlComponent"; - -const mapStateToProps = state => { - return { - mapScale: state.map.scale - }; -}; - -const mapDispatchToProps = dispatch => { - return { - zoomInOnCenter: zoomIn => dispatch(zoomInOnCenter(zoomIn)) - }; -}; - -const ZoomControlContainer = connect(mapStateToProps, mapDispatchToProps)( - ZoomControlComponent -); - -export default ZoomControlContainer; diff --git a/src/containers/app/map/layers/MapLayer.js b/src/containers/app/map/layers/MapLayer.js deleted file mode 100644 index cf971350..00000000 --- a/src/containers/app/map/layers/MapLayer.js +++ /dev/null @@ -1,13 +0,0 @@ -import { connect } from "react-redux"; -import MapLayerComponent from "../../../../components/app/map/layers/MapLayerComponent"; - -const mapStateToProps = state => { - return { - mapPosition: state.map.position, - mapScale: state.map.scale - }; -}; - -const MapLayer = connect(mapStateToProps)(MapLayerComponent); - -export default MapLayer; diff --git a/src/containers/app/map/layers/ObjectHoverLayer.js b/src/containers/app/map/layers/ObjectHoverLayer.js deleted file mode 100644 index 9b28575e..00000000 --- a/src/containers/app/map/layers/ObjectHoverLayer.js +++ /dev/null @@ -1,37 +0,0 @@ -import { connect } from "react-redux"; -import { addRackToTile } from "../../../../actions/topology/room"; -import ObjectHoverLayerComponent from "../../../../components/app/map/layers/ObjectHoverLayerComponent"; -import { findTileWithPosition } from "../../../../util/tile-calculations"; - -const mapStateToProps = state => { - return { - mapPosition: state.map.position, - mapScale: state.map.scale, - isEnabled: () => state.construction.inRackConstructionMode, - isValid: (x, y) => { - if (state.interactionLevel.mode !== "ROOM") { - return false; - } - - const currentRoom = state.objects.room[state.interactionLevel.roomId]; - const tiles = currentRoom.tileIds.map( - tileId => state.objects.tile[tileId] - ); - const tile = findTileWithPosition(tiles, x, y); - - return !(tile === null || tile.objectType); - } - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onClick: (x, y) => dispatch(addRackToTile(x, y)) - }; -}; - -const ObjectHoverLayer = connect(mapStateToProps, mapDispatchToProps)( - ObjectHoverLayerComponent -); - -export default ObjectHoverLayer; diff --git a/src/containers/app/map/layers/RoomHoverLayer.js b/src/containers/app/map/layers/RoomHoverLayer.js deleted file mode 100644 index 020102bf..00000000 --- a/src/containers/app/map/layers/RoomHoverLayer.js +++ /dev/null @@ -1,55 +0,0 @@ -import { connect } from "react-redux"; -import { toggleTileAtLocation } from "../../../../actions/topology/building"; -import RoomHoverLayerComponent from "../../../../components/app/map/layers/RoomHoverLayerComponent"; -import { - deriveValidNextTilePositions, - findPositionInPositions, - findPositionInRooms -} from "../../../../util/tile-calculations"; - -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 oldRooms = Object.keys(state.objects.room) - .map(id => Object.assign({}, state.objects.room[id])) - .filter( - room => - state.objects.datacenter[state.currentDatacenterId].roomIds.indexOf( - room.id - ) !== -1 && room.id !== state.construction.currentRoomInConstruction - ); - - [...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 - ); - return findPositionInPositions(validNextPositions, x, y) !== -1; - } - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onClick: (x, y) => dispatch(toggleTileAtLocation(x, y)) - }; -}; - -const RoomHoverLayer = connect(mapStateToProps, mapDispatchToProps)( - RoomHoverLayerComponent -); - -export default RoomHoverLayer; diff --git a/src/containers/app/sidebars/elements/LoadBarContainer.js b/src/containers/app/sidebars/elements/LoadBarContainer.js deleted file mode 100644 index 2e637f9a..00000000 --- a/src/containers/app/sidebars/elements/LoadBarContainer.js +++ /dev/null @@ -1,32 +0,0 @@ -import { connect } from "react-redux"; -import LoadBarComponent from "../../../../components/app/sidebars/elements/LoadBarComponent"; -import { getStateLoad } from "../../../../util/simulation-load"; - -const mapStateToProps = (state, ownProps) => { - let percent = 0; - let enabled = false; - - const objectStates = state.states[ownProps.objectType]; - if ( - objectStates[state.currentTick] && - objectStates[state.currentTick][ownProps.objectId] - ) { - percent = Math.floor( - 100 * - getStateLoad( - state.loadMetric, - objectStates[state.currentTick][ownProps.objectId] - ) - ); - enabled = true; - } - - return { - percent, - enabled - }; -}; - -const LoadBarContainer = connect(mapStateToProps)(LoadBarComponent); - -export default LoadBarContainer; diff --git a/src/containers/app/sidebars/elements/LoadChartContainer.js b/src/containers/app/sidebars/elements/LoadChartContainer.js deleted file mode 100644 index 57bfec38..00000000 --- a/src/containers/app/sidebars/elements/LoadChartContainer.js +++ /dev/null @@ -1,31 +0,0 @@ -import { connect } from "react-redux"; -import LoadChartComponent from "../../../../components/app/sidebars/elements/LoadChartComponent"; -import { getStateLoad } from "../../../../util/simulation-load"; - -const mapStateToProps = (state, ownProps) => { - const data = []; - - if (state.lastSimulatedTick !== -1) { - const objectStates = state.states[ownProps.objectType]; - Object.keys(objectStates).forEach(tick => { - if (objectStates[tick][ownProps.objectId]) { - data.push({ - x: tick, - y: getStateLoad( - state.loadMetric, - objectStates[tick][ownProps.objectId] - ) - }); - } - }); - } - - return { - data, - currentTick: state.currentTick - }; -}; - -const LoadChartContainer = connect(mapStateToProps)(LoadChartComponent); - -export default LoadChartContainer; diff --git a/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js b/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js deleted file mode 100644 index 25a0d9e9..00000000 --- a/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js +++ /dev/null @@ -1,38 +0,0 @@ -import { connect } from "react-redux"; -import ExperimentMetadataComponent from "../../../../components/app/sidebars/simulation/ExperimentMetadataComponent"; - -const mapStateToProps = state => { - if (!state.objects.experiment[state.currentExperimentId]) { - return { - experimentName: "Loading experiment", - pathName: "", - traceName: "", - schedulerName: "" - }; - } - - const path = - state.objects.path[ - state.objects.experiment[state.currentExperimentId].pathId - ]; - const pathName = path.name ? path.name : "Path " + path.id; - - return { - experimentName: state.objects.experiment[state.currentExperimentId].name, - pathName, - traceName: - state.objects.trace[ - state.objects.experiment[state.currentExperimentId].traceId - ].name, - schedulerName: - state.objects.scheduler[ - state.objects.experiment[state.currentExperimentId].schedulerName - ].name - }; -}; - -const ExperimentMetadataContainer = connect(mapStateToProps)( - ExperimentMetadataComponent -); - -export default ExperimentMetadataContainer; diff --git a/src/containers/app/sidebars/simulation/LoadMetricContainer.js b/src/containers/app/sidebars/simulation/LoadMetricContainer.js deleted file mode 100644 index 0c66b582..00000000 --- a/src/containers/app/sidebars/simulation/LoadMetricContainer.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from "react-redux"; -import LoadMetricComponent from "../../../../components/app/sidebars/simulation/LoadMetricComponent"; - -const mapStateToProps = state => { - return { - loadMetric: state.loadMetric - }; -}; - -const LoadMetricContainer = connect(mapStateToProps)(LoadMetricComponent); - -export default LoadMetricContainer; diff --git a/src/containers/app/sidebars/simulation/TaskContainer.js b/src/containers/app/sidebars/simulation/TaskContainer.js deleted file mode 100644 index 093d4266..00000000 --- a/src/containers/app/sidebars/simulation/TaskContainer.js +++ /dev/null @@ -1,26 +0,0 @@ -import { connect } from "react-redux"; -import TaskComponent from "../../../../components/app/sidebars/simulation/TaskComponent"; - -const mapStateToProps = (state, ownProps) => { - let flopsLeft = state.objects.task[ownProps.taskId].totalFlopCount; - - if ( - state.states.task[state.currentTick] && - state.states.task[state.currentTick][ownProps.taskId] - ) { - flopsLeft = state.states.task[state.currentTick][ownProps.taskId].flopsLeft; - } else if ( - state.objects.task[ownProps.taskId].startTick < state.currentTick - ) { - flopsLeft = 0; - } - - return { - task: state.objects.task[ownProps.taskId], - flopsLeft - }; -}; - -const TaskContainer = connect(mapStateToProps)(TaskComponent); - -export default TaskContainer; diff --git a/src/containers/app/sidebars/simulation/TraceContainer.js b/src/containers/app/sidebars/simulation/TraceContainer.js deleted file mode 100644 index 682b6cc9..00000000 --- a/src/containers/app/sidebars/simulation/TraceContainer.js +++ /dev/null @@ -1,25 +0,0 @@ -import { connect } from "react-redux"; -import TraceComponent from "../../../../components/app/sidebars/simulation/TraceComponent"; - -const mapStateToProps = state => { - if ( - !state.objects.experiment[state.currentExperimentId] || - !state.objects.trace[ - state.objects.experiment[state.currentExperimentId].traceId - ].jobIds - ) { - return { - jobs: [] - }; - } - - return { - jobs: state.objects.trace[ - state.objects.experiment[state.currentExperimentId].traceId - ].jobIds.map(id => state.objects.job[id]) - }; -}; - -const TraceContainer = connect(mapStateToProps)(TraceComponent); - -export default TraceContainer; diff --git a/src/containers/app/sidebars/topology/TopologySidebar.js b/src/containers/app/sidebars/topology/TopologySidebar.js deleted file mode 100644 index 31c902fc..00000000 --- a/src/containers/app/sidebars/topology/TopologySidebar.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from "react-redux"; -import TopologySidebarComponent from "../../../../components/app/sidebars/topology/TopologySidebarComponent"; - -const mapStateToProps = state => { - return { - interactionLevel: state.interactionLevel - }; -}; - -const TopologySidebar = connect(mapStateToProps)(TopologySidebarComponent); - -export default TopologySidebar; diff --git a/src/containers/app/sidebars/topology/building/BuildingSidebarContainer.js b/src/containers/app/sidebars/topology/building/BuildingSidebarContainer.js deleted file mode 100644 index da24b8f0..00000000 --- a/src/containers/app/sidebars/topology/building/BuildingSidebarContainer.js +++ /dev/null @@ -1,14 +0,0 @@ -import { connect } from "react-redux"; -import BuildingSidebarComponent from "../../../../../components/app/sidebars/topology/building/BuildingSidebarComponent"; - -const mapStateToProps = state => { - return { - inSimulation: state.currentExperimentId !== -1 - }; -}; - -const BuildingSidebarContainer = connect(mapStateToProps)( - BuildingSidebarComponent -); - -export default BuildingSidebarContainer; diff --git a/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js b/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js deleted file mode 100644 index bb64cbb4..00000000 --- a/src/containers/app/sidebars/topology/building/NewRoomConstructionContainer.js +++ /dev/null @@ -1,27 +0,0 @@ -import { connect } from "react-redux"; -import { - cancelNewRoomConstruction, - finishNewRoomConstruction, - startNewRoomConstruction -} from "../../../../../actions/topology/building"; -import StartNewRoomConstructionComponent from "../../../../../components/app/sidebars/topology/building/NewRoomConstructionComponent"; - -const mapStateToProps = state => { - return { - currentRoomInConstruction: state.construction.currentRoomInConstruction - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onStart: () => dispatch(startNewRoomConstruction()), - onFinish: () => dispatch(finishNewRoomConstruction()), - onCancel: () => dispatch(cancelNewRoomConstruction()) - }; -}; - -const NewRoomConstructionButton = connect(mapStateToProps, mapDispatchToProps)( - StartNewRoomConstructionComponent -); - -export default NewRoomConstructionButton; diff --git a/src/containers/app/sidebars/topology/machine/BackToRackContainer.js b/src/containers/app/sidebars/topology/machine/BackToRackContainer.js deleted file mode 100644 index 885c533d..00000000 --- a/src/containers/app/sidebars/topology/machine/BackToRackContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { goDownOneInteractionLevel } from "../../../../../actions/interaction-level"; -import BackToRackComponent from "../../../../../components/app/sidebars/topology/machine/BackToRackComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(goDownOneInteractionLevel()) - }; -}; - -const BackToRackContainer = connect(undefined, mapDispatchToProps)( - BackToRackComponent -); - -export default BackToRackContainer; diff --git a/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js b/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js deleted file mode 100644 index f42c8ba7..00000000 --- a/src/containers/app/sidebars/topology/machine/DeleteMachineContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { openDeleteMachineModal } from "../../../../../actions/modals/topology"; -import DeleteMachineComponent from "../../../../../components/app/sidebars/topology/machine/DeleteMachineComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(openDeleteMachineModal()) - }; -}; - -const DeleteMachineContainer = connect(undefined, mapDispatchToProps)( - DeleteMachineComponent -); - -export default DeleteMachineContainer; diff --git a/src/containers/app/sidebars/topology/machine/MachineNameContainer.js b/src/containers/app/sidebars/topology/machine/MachineNameContainer.js deleted file mode 100644 index 05d2bf80..00000000 --- a/src/containers/app/sidebars/topology/machine/MachineNameContainer.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from "react-redux"; -import MachineNameComponent from "../../../../../components/app/sidebars/topology/machine/MachineNameComponent"; - -const mapStateToProps = state => { - return { - position: state.interactionLevel.position - }; -}; - -const MachineNameContainer = connect(mapStateToProps)(MachineNameComponent); - -export default MachineNameContainer; diff --git a/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js b/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js deleted file mode 100644 index 7729385e..00000000 --- a/src/containers/app/sidebars/topology/machine/MachineSidebarContainer.js +++ /dev/null @@ -1,18 +0,0 @@ -import { connect } from "react-redux"; -import MachineSidebarComponent from "../../../../../components/app/sidebars/topology/machine/MachineSidebarComponent"; - -const mapStateToProps = state => { - return { - inSimulation: state.currentExperimentId !== -1, - machineId: - state.objects.rack[ - state.objects.tile[state.interactionLevel.tileId].objectId - ].machineIds[state.interactionLevel.position - 1] - }; -}; - -const MachineSidebarContainer = connect(mapStateToProps)( - MachineSidebarComponent -); - -export default MachineSidebarContainer; diff --git a/src/containers/app/sidebars/topology/machine/UnitAddContainer.js b/src/containers/app/sidebars/topology/machine/UnitAddContainer.js deleted file mode 100644 index 0e5a6073..00000000 --- a/src/containers/app/sidebars/topology/machine/UnitAddContainer.js +++ /dev/null @@ -1,21 +0,0 @@ -import { connect } from "react-redux"; -import { addUnit } from "../../../../../actions/topology/machine"; -import UnitAddComponent from "../../../../../components/app/sidebars/topology/machine/UnitAddComponent"; - -const mapStateToProps = (state, ownProps) => { - return { - units: Object.values(state.objects[ownProps.unitType]) - }; -}; - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onAdd: id => dispatch(addUnit(ownProps.unitType, id)) - }; -}; - -const UnitAddContainer = connect(mapStateToProps, mapDispatchToProps)( - UnitAddComponent -); - -export default UnitAddContainer; diff --git a/src/containers/app/sidebars/topology/machine/UnitContainer.js b/src/containers/app/sidebars/topology/machine/UnitContainer.js deleted file mode 100644 index a919e8d3..00000000 --- a/src/containers/app/sidebars/topology/machine/UnitContainer.js +++ /dev/null @@ -1,22 +0,0 @@ -import { connect } from "react-redux"; -import { deleteUnit } from "../../../../../actions/topology/machine"; -import UnitComponent from "../../../../../components/app/sidebars/topology/machine/UnitComponent"; - -const mapStateToProps = (state, ownProps) => { - return { - unit: state.objects[ownProps.unitType][ownProps.unitId], - inSimulation: state.currentExperimentId !== -1 - }; -}; - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onDelete: () => dispatch(deleteUnit(ownProps.unitType, ownProps.index)) - }; -}; - -const UnitContainer = connect(mapStateToProps, mapDispatchToProps)( - UnitComponent -); - -export default UnitContainer; diff --git a/src/containers/app/sidebars/topology/machine/UnitListContainer.js b/src/containers/app/sidebars/topology/machine/UnitListContainer.js deleted file mode 100644 index 6554b8f8..00000000 --- a/src/containers/app/sidebars/topology/machine/UnitListContainer.js +++ /dev/null @@ -1,18 +0,0 @@ -import { connect } from "react-redux"; -import UnitListComponent from "../../../../../components/app/sidebars/topology/machine/UnitListComponent"; - -const mapStateToProps = (state, ownProps) => { - return { - unitIds: - state.objects.machine[ - state.objects.rack[ - state.objects.tile[state.interactionLevel.tileId].objectId - ].machineIds[state.interactionLevel.position - 1] - ][ownProps.unitType + "Ids"], - inSimulation: state.currentExperimentId !== -1 - }; -}; - -const UnitListContainer = connect(mapStateToProps)(UnitListComponent); - -export default UnitListContainer; diff --git a/src/containers/app/sidebars/topology/machine/UnitTabsContainer.js b/src/containers/app/sidebars/topology/machine/UnitTabsContainer.js deleted file mode 100644 index 85d83877..00000000 --- a/src/containers/app/sidebars/topology/machine/UnitTabsContainer.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from "react-redux"; -import UnitTabsComponent from "../../../../../components/app/sidebars/topology/machine/UnitTabsComponent"; - -const mapStateToProps = state => { - return { - inSimulation: state.currentExperimentId !== -1 - }; -}; - -const UnitTabsContainer = connect(mapStateToProps)(UnitTabsComponent); - -export default UnitTabsContainer; diff --git a/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js b/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js deleted file mode 100644 index 1b1bb2b0..00000000 --- a/src/containers/app/sidebars/topology/rack/BackToRoomContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { goDownOneInteractionLevel } from "../../../../../actions/interaction-level"; -import BackToRoomComponent from "../../../../../components/app/sidebars/topology/rack/BackToRoomComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(goDownOneInteractionLevel()) - }; -}; - -const BackToRoomContainer = connect(undefined, mapDispatchToProps)( - BackToRoomComponent -); - -export default BackToRoomContainer; diff --git a/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js b/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js deleted file mode 100644 index a54ceb23..00000000 --- a/src/containers/app/sidebars/topology/rack/DeleteRackContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { openDeleteRackModal } from "../../../../../actions/modals/topology"; -import DeleteRackComponent from "../../../../../components/app/sidebars/topology/rack/DeleteRackComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(openDeleteRackModal()) - }; -}; - -const DeleteRackContainer = connect(undefined, mapDispatchToProps)( - DeleteRackComponent -); - -export default DeleteRackContainer; diff --git a/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js b/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js deleted file mode 100644 index 527805a2..00000000 --- a/src/containers/app/sidebars/topology/rack/EmptySlotContainer.js +++ /dev/null @@ -1,21 +0,0 @@ -import { connect } from "react-redux"; -import { addMachine } from "../../../../../actions/topology/rack"; -import EmptySlotComponent from "../../../../../components/app/sidebars/topology/rack/EmptySlotComponent"; - -const mapStateToProps = state => { - return { - inSimulation: state.currentExperimentId !== -1 - }; -}; - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onAdd: () => dispatch(addMachine(ownProps.position)) - }; -}; - -const EmptySlotContainer = connect(mapStateToProps, mapDispatchToProps)( - EmptySlotComponent -); - -export default EmptySlotContainer; diff --git a/src/containers/app/sidebars/topology/rack/MachineContainer.js b/src/containers/app/sidebars/topology/rack/MachineContainer.js deleted file mode 100644 index 8cd177e7..00000000 --- a/src/containers/app/sidebars/topology/rack/MachineContainer.js +++ /dev/null @@ -1,40 +0,0 @@ -import { connect } from "react-redux"; -import { goFromRackToMachine } from "../../../../../actions/interaction-level"; -import MachineComponent from "../../../../../components/app/sidebars/topology/rack/MachineComponent"; -import { getStateLoad } from "../../../../../util/simulation-load"; - -const mapStateToProps = (state, ownProps) => { - const machine = state.objects.machine[ownProps.machineId]; - const inSimulation = state.currentExperimentId !== -1; - - let machineLoad = undefined; - if (inSimulation) { - if ( - state.states.machine[state.currentTick] && - state.states.machine[state.currentTick][machine.id] - ) { - machineLoad = getStateLoad( - state.loadMetric, - state.states.machine[state.currentTick][machine.id] - ); - } - } - - return { - machine, - inSimulation, - machineLoad - }; -}; - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onClick: () => dispatch(goFromRackToMachine(ownProps.position)) - }; -}; - -const MachineContainer = connect(mapStateToProps, mapDispatchToProps)( - MachineComponent -); - -export default MachineContainer; diff --git a/src/containers/app/sidebars/topology/rack/MachineListContainer.js b/src/containers/app/sidebars/topology/rack/MachineListContainer.js deleted file mode 100644 index b19a50ae..00000000 --- a/src/containers/app/sidebars/topology/rack/MachineListContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import MachineListComponent from "../../../../../components/app/sidebars/topology/rack/MachineListComponent"; - -const mapStateToProps = state => { - return { - machineIds: - state.objects.rack[ - state.objects.tile[state.interactionLevel.tileId].objectId - ].machineIds - }; -}; - -const MachineListContainer = connect(mapStateToProps)(MachineListComponent); - -export default MachineListContainer; diff --git a/src/containers/app/sidebars/topology/rack/RackNameContainer.js b/src/containers/app/sidebars/topology/rack/RackNameContainer.js deleted file mode 100644 index 8f364ca0..00000000 --- a/src/containers/app/sidebars/topology/rack/RackNameContainer.js +++ /dev/null @@ -1,24 +0,0 @@ -import { connect } from "react-redux"; -import { openEditRackNameModal } from "../../../../../actions/modals/topology"; -import RackNameComponent from "../../../../../components/app/sidebars/topology/rack/RackNameComponent"; - -const mapStateToProps = state => { - return { - rackName: - state.objects.rack[ - state.objects.tile[state.interactionLevel.tileId].objectId - ].name - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onEdit: () => dispatch(openEditRackNameModal()) - }; -}; - -const RackNameContainer = connect(mapStateToProps, mapDispatchToProps)( - RackNameComponent -); - -export default RackNameContainer; diff --git a/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js b/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js deleted file mode 100644 index 0a2bfdcc..00000000 --- a/src/containers/app/sidebars/topology/rack/RackSidebarContainer.js +++ /dev/null @@ -1,13 +0,0 @@ -import { connect } from "react-redux"; -import RackSidebarComponent from "../../../../../components/app/sidebars/topology/rack/RackSidebarComponent"; - -const mapStateToProps = state => { - return { - rackId: state.objects.tile[state.interactionLevel.tileId].objectId, - inSimulation: state.currentExperimentId !== -1 - }; -}; - -const RackSidebarContainer = connect(mapStateToProps)(RackSidebarComponent); - -export default RackSidebarContainer; diff --git a/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js b/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js deleted file mode 100644 index 02288b7b..00000000 --- a/src/containers/app/sidebars/topology/room/BackToBuildingContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { goDownOneInteractionLevel } from "../../../../../actions/interaction-level"; -import BackToBuildingComponent from "../../../../../components/app/sidebars/topology/room/BackToBuildingComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(goDownOneInteractionLevel()) - }; -}; - -const BackToBuildingContainer = connect(undefined, mapDispatchToProps)( - BackToBuildingComponent -); - -export default BackToBuildingContainer; diff --git a/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js b/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js deleted file mode 100644 index 5223061d..00000000 --- a/src/containers/app/sidebars/topology/room/DeleteRoomContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { openDeleteRoomModal } from "../../../../../actions/modals/topology"; -import DeleteRoomComponent from "../../../../../components/app/sidebars/topology/room/DeleteRoomComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(openDeleteRoomModal()) - }; -}; - -const DeleteRoomContainer = connect(undefined, mapDispatchToProps)( - DeleteRoomComponent -); - -export default DeleteRoomContainer; diff --git a/src/containers/app/sidebars/topology/room/EditRoomContainer.js b/src/containers/app/sidebars/topology/room/EditRoomContainer.js deleted file mode 100644 index 81052f54..00000000 --- a/src/containers/app/sidebars/topology/room/EditRoomContainer.js +++ /dev/null @@ -1,26 +0,0 @@ -import { connect } from "react-redux"; -import { - finishRoomEdit, - startRoomEdit -} from "../../../../../actions/topology/building"; -import EditRoomComponent from "../../../../../components/app/sidebars/topology/room/EditRoomComponent"; - -const mapStateToProps = state => { - return { - isEditing: state.construction.currentRoomInConstruction !== -1, - isInRackConstructionMode: state.construction.inRackConstructionMode - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onEdit: () => dispatch(startRoomEdit()), - onFinish: () => dispatch(finishRoomEdit()) - }; -}; - -const EditRoomContainer = connect(mapStateToProps, mapDispatchToProps)( - EditRoomComponent -); - -export default EditRoomContainer; diff --git a/src/containers/app/sidebars/topology/room/RackConstructionContainer.js b/src/containers/app/sidebars/topology/room/RackConstructionContainer.js deleted file mode 100644 index c784d3ae..00000000 --- a/src/containers/app/sidebars/topology/room/RackConstructionContainer.js +++ /dev/null @@ -1,26 +0,0 @@ -import { connect } from "react-redux"; -import { - startRackConstruction, - stopRackConstruction -} from "../../../../../actions/topology/room"; -import RackConstructionComponent from "../../../../../components/app/sidebars/topology/room/RackConstructionComponent"; - -const mapStateToProps = state => { - return { - inRackConstructionMode: state.construction.inRackConstructionMode, - isEditingRoom: state.construction.currentRoomInConstruction !== -1 - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onStart: () => dispatch(startRackConstruction()), - onStop: () => dispatch(stopRackConstruction()) - }; -}; - -const RackConstructionContainer = connect(mapStateToProps, mapDispatchToProps)( - RackConstructionComponent -); - -export default RackConstructionContainer; diff --git a/src/containers/app/sidebars/topology/room/RoomNameContainer.js b/src/containers/app/sidebars/topology/room/RoomNameContainer.js deleted file mode 100644 index 36125521..00000000 --- a/src/containers/app/sidebars/topology/room/RoomNameContainer.js +++ /dev/null @@ -1,21 +0,0 @@ -import { connect } from "react-redux"; -import { openEditRoomNameModal } from "../../../../../actions/modals/topology"; -import RoomNameComponent from "../../../../../components/app/sidebars/topology/room/RoomNameComponent"; - -const mapStateToProps = state => { - return { - roomName: state.objects.room[state.interactionLevel.roomId].name - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onEdit: () => dispatch(openEditRoomNameModal()) - }; -}; - -const RoomNameContainer = connect(mapStateToProps, mapDispatchToProps)( - RoomNameComponent -); - -export default RoomNameContainer; diff --git a/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js b/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js deleted file mode 100644 index 38d5fb80..00000000 --- a/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js +++ /dev/null @@ -1,14 +0,0 @@ -import { connect } from "react-redux"; -import RoomSidebarComponent from "../../../../../components/app/sidebars/topology/room/RoomSidebarComponent"; - -const mapStateToProps = state => { - return { - roomId: state.interactionLevel.roomId, - roomType: state.objects.room[state.interactionLevel.roomId].roomType, - inSimulation: state.currentExperimentId !== -1 - }; -}; - -const RoomSidebarContainer = connect(mapStateToProps)(RoomSidebarComponent); - -export default RoomSidebarContainer; diff --git a/src/containers/app/sidebars/topology/room/RoomTypeContainer.js b/src/containers/app/sidebars/topology/room/RoomTypeContainer.js deleted file mode 100644 index 414852f1..00000000 --- a/src/containers/app/sidebars/topology/room/RoomTypeContainer.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from "react-redux"; -import RoomTypeComponent from "../../../../../components/app/sidebars/topology/room/RoomTypeComponent"; - -const mapStateToProps = state => { - return { - roomType: state.objects.room[state.interactionLevel.roomId].roomType - }; -}; - -const RoomNameContainer = connect(mapStateToProps)(RoomTypeComponent); - -export default RoomNameContainer; diff --git a/src/containers/app/timeline/PlayButtonContainer.js b/src/containers/app/timeline/PlayButtonContainer.js deleted file mode 100644 index 4e3c3d81..00000000 --- a/src/containers/app/timeline/PlayButtonContainer.js +++ /dev/null @@ -1,27 +0,0 @@ -import { connect } from "react-redux"; -import { - pauseSimulation, - playSimulation -} from "../../../actions/simulation/playback"; -import PlayButtonComponent from "../../../components/app/timeline/PlayButtonComponent"; - -const mapStateToProps = state => { - return { - isPlaying: state.isPlaying, - currentTick: state.currentTick, - lastSimulatedTick: state.lastSimulatedTick - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onPlay: () => dispatch(playSimulation()), - onPause: () => dispatch(pauseSimulation()) - }; -}; - -const PlayButtonContainer = connect(mapStateToProps, mapDispatchToProps)( - PlayButtonComponent -); - -export default PlayButtonContainer; diff --git a/src/containers/app/timeline/TimelineContainer.js b/src/containers/app/timeline/TimelineContainer.js deleted file mode 100644 index 74d37d58..00000000 --- a/src/containers/app/timeline/TimelineContainer.js +++ /dev/null @@ -1,41 +0,0 @@ -import { connect } from "react-redux"; -import { pauseSimulation } from "../../../actions/simulation/playback"; -import { incrementTick } from "../../../actions/simulation/tick"; -import { setCurrentDatacenter } from "../../../actions/topology/building"; -import TimelineComponent from "../../../components/app/timeline/TimelineComponent"; - -const mapStateToProps = state => { - let sections = []; - if (state.currentExperimentId !== -1) { - const sectionIds = - state.objects.path[ - state.objects.experiment[state.currentExperimentId].pathId - ].sectionIds; - - if (sectionIds) { - sections = sectionIds.map(sectionId => state.objects.section[sectionId]); - } - } - - return { - isPlaying: state.isPlaying, - currentTick: state.currentTick, - lastSimulatedTick: state.lastSimulatedTick, - currentDatacenterId: state.currentDatacenterId, - sections - }; -}; - -const mapDispatchToProps = dispatch => { - return { - incrementTick: () => dispatch(incrementTick()), - pauseSimulation: () => dispatch(pauseSimulation()), - setCurrentDatacenter: id => dispatch(setCurrentDatacenter(id)) - }; -}; - -const TimelineContainer = connect(mapStateToProps, mapDispatchToProps)( - TimelineComponent -); - -export default TimelineContainer; diff --git a/src/containers/app/timeline/TimelineControlsContainer.js b/src/containers/app/timeline/TimelineControlsContainer.js deleted file mode 100644 index ac851b2e..00000000 --- a/src/containers/app/timeline/TimelineControlsContainer.js +++ /dev/null @@ -1,36 +0,0 @@ -import { connect } from "react-redux"; -import { goToTick } from "../../../actions/simulation/tick"; -import TimelineControlsComponent from "../../../components/app/timeline/TimelineControlsComponent"; - -const mapStateToProps = state => { - let sectionTicks = []; - if (state.currentExperimentId !== -1) { - const sectionIds = - state.objects.path[ - state.objects.experiment[state.currentExperimentId].pathId - ].sectionIds; - if (sectionIds) { - sectionTicks = sectionIds - .filter(sectionId => state.objects.section[sectionId].startTick !== 0) - .map(sectionId => state.objects.section[sectionId].startTick); - } - } - - return { - currentTick: state.currentTick, - lastSimulatedTick: state.lastSimulatedTick, - sectionTicks - }; -}; - -const mapDispatchToProps = dispatch => { - return { - goToTick: tick => dispatch(goToTick(tick)) - }; -}; - -const TimelineControlsContainer = connect(mapStateToProps, mapDispatchToProps)( - TimelineControlsComponent -); - -export default TimelineControlsContainer; diff --git a/src/containers/app/timeline/TimelineLabelsContainer.js b/src/containers/app/timeline/TimelineLabelsContainer.js deleted file mode 100644 index 9d7f268d..00000000 --- a/src/containers/app/timeline/TimelineLabelsContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import TimelineLabelsComponent from "../../../components/app/timeline/TimelineLabelsComponent"; - -const mapStateToProps = state => { - return { - currentTick: state.currentTick, - lastSimulatedTick: state.lastSimulatedTick - }; -}; - -const TimelineLabelsContainer = connect(mapStateToProps)( - TimelineLabelsComponent -); - -export default TimelineLabelsContainer; diff --git a/src/containers/auth/Login.js b/src/containers/auth/Login.js deleted file mode 100644 index 15af8e62..00000000 --- a/src/containers/auth/Login.js +++ /dev/null @@ -1,65 +0,0 @@ -import PropTypes from "prop-types"; -import React from "react"; -import GoogleLogin from "react-google-login"; -import { connect } from "react-redux"; -import { logIn } from "../../actions/auth"; - -class LoginContainer extends React.Component { - static propTypes = { - visible: PropTypes.bool.isRequired, - onLogin: PropTypes.func.isRequired - }; - - onAuthResponse(response) { - this.props.onLogin({ - email: response.getBasicProfile().getEmail(), - givenName: response.getBasicProfile().getGivenName(), - familyName: response.getBasicProfile().getFamilyName(), - googleId: response.googleId, - authToken: response.getAuthResponse().id_token, - expiresAt: response.getAuthResponse().expires_at - }); - } - - onAuthFailure(error) { - console.error(error); - } - - render() { - if (!this.props.visible) { - return <span />; - } - - return ( - <GoogleLogin - clientId={process.env.REACT_APP_OAUTH_CLIENT_ID} - onSuccess={this.onAuthResponse.bind(this)} - onFailure={this.onAuthFailure.bind(this)} - render={renderProps => ( - <span onClick={renderProps.onClick} className="login btn btn-primary"> - <span className="fa fa-google" /> Login with Google - </span> - )} - /> - ); - } -} - -const mapStateToProps = (state, ownProps) => { - return { - visible: ownProps.visible - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onLogin: payload => dispatch(logIn(payload)) - }; -}; - -const Login = connect( - mapStateToProps, - mapDispatchToProps -)(LoginContainer); - -export default Login; diff --git a/src/containers/auth/Logout.js b/src/containers/auth/Logout.js deleted file mode 100644 index 918932f6..00000000 --- a/src/containers/auth/Logout.js +++ /dev/null @@ -1,13 +0,0 @@ -import { connect } from "react-redux"; -import { logOut } from "../../actions/auth"; -import LogoutButton from "../../components/navigation/LogoutButton"; - -const mapDispatchToProps = dispatch => { - return { - onLogout: () => dispatch(logOut()) - }; -}; - -const Logout = connect(undefined, mapDispatchToProps)(LogoutButton); - -export default Logout; diff --git a/src/containers/auth/ProfileName.js b/src/containers/auth/ProfileName.js deleted file mode 100644 index 21941bd2..00000000 --- a/src/containers/auth/ProfileName.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; - -const mapStateToProps = state => { - return { - text: state.auth.givenName + " " + state.auth.familyName - }; -}; - -const SpanElement = ({ text }) => <span>{text}</span>; - -const ProfileName = connect(mapStateToProps)(SpanElement); - -export default ProfileName; diff --git a/src/containers/experiments/ExperimentListContainer.js b/src/containers/experiments/ExperimentListContainer.js deleted file mode 100644 index 53bb1dad..00000000 --- a/src/containers/experiments/ExperimentListContainer.js +++ /dev/null @@ -1,28 +0,0 @@ -import { connect } from "react-redux"; -import ExperimentListComponent from "../../components/experiments/ExperimentListComponent"; - -const mapStateToProps = state => { - if ( - state.currentSimulationId === -1 || - !("experimentIds" in state.objects.simulation[state.currentSimulationId]) - ) { - return { - loading: true, - experimentIds: [] - }; - } - - const experimentIds = - state.objects.simulation[state.currentSimulationId].experimentIds; - if (experimentIds) { - return { - experimentIds - }; - } -}; - -const ExperimentListContainer = connect(mapStateToProps)( - ExperimentListComponent -); - -export default ExperimentListContainer; diff --git a/src/containers/experiments/ExperimentRowContainer.js b/src/containers/experiments/ExperimentRowContainer.js deleted file mode 100644 index 96ebc3db..00000000 --- a/src/containers/experiments/ExperimentRowContainer.js +++ /dev/null @@ -1,30 +0,0 @@ -import { connect } from "react-redux"; -import { deleteExperiment } from "../../actions/experiments"; -import ExperimentRowComponent from "../../components/experiments/ExperimentRowComponent"; - -const mapStateToProps = (state, ownProps) => { - const experiment = Object.assign( - {}, - state.objects.experiment[ownProps.experimentId] - ); - experiment.trace = state.objects.trace[experiment.traceId]; - experiment.scheduler = state.objects.scheduler[experiment.schedulerName]; - experiment.path = state.objects.path[experiment.pathId]; - - return { - experiment, - simulationId: state.currentSimulationId - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onDelete: id => dispatch(deleteExperiment(id)) - }; -}; - -const ExperimentRowContainer = connect(mapStateToProps, mapDispatchToProps)( - ExperimentRowComponent -); - -export default ExperimentRowContainer; diff --git a/src/containers/experiments/NewExperimentButtonContainer.js b/src/containers/experiments/NewExperimentButtonContainer.js deleted file mode 100644 index 60eb92a6..00000000 --- a/src/containers/experiments/NewExperimentButtonContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { openNewExperimentModal } from "../../actions/modals/experiments"; -import NewExperimentButtonComponent from "../../components/experiments/NewExperimentButtonComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(openNewExperimentModal()) - }; -}; - -const NewExperimentButtonContainer = connect(undefined, mapDispatchToProps)( - NewExperimentButtonComponent -); - -export default NewExperimentButtonContainer; diff --git a/src/containers/modals/DeleteMachineModal.js b/src/containers/modals/DeleteMachineModal.js deleted file mode 100644 index eba37833..00000000 --- a/src/containers/modals/DeleteMachineModal.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { closeDeleteMachineModal } from "../../actions/modals/topology"; -import { deleteMachine } from "../../actions/topology/machine"; -import ConfirmationModal from "../../components/modals/ConfirmationModal"; - -const DeleteMachineModalComponent = ({ visible, callback }) => ( - <ConfirmationModal - title="Delete this machine" - message="Are you sure you want to delete this machine?" - show={visible} - callback={callback} - /> -); - -const mapStateToProps = state => { - return { - visible: state.modals.deleteMachineModalVisible - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteMachine()); - } - dispatch(closeDeleteMachineModal()); - } - }; -}; - -const DeleteMachineModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteMachineModalComponent -); - -export default DeleteMachineModal; diff --git a/src/containers/modals/DeleteProfileModal.js b/src/containers/modals/DeleteProfileModal.js deleted file mode 100644 index 674e9408..00000000 --- a/src/containers/modals/DeleteProfileModal.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { closeDeleteProfileModal } from "../../actions/modals/profile"; -import { deleteCurrentUser } from "../../actions/users"; -import ConfirmationModal from "../../components/modals/ConfirmationModal"; - -const DeleteProfileModalComponent = ({ visible, callback }) => ( - <ConfirmationModal - title="Delete my account" - message="Are you sure you want to delete your OpenDC account?" - show={visible} - callback={callback} - /> -); - -const mapStateToProps = state => { - return { - visible: state.modals.deleteProfileModalVisible - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteCurrentUser()); - } - dispatch(closeDeleteProfileModal()); - } - }; -}; - -const DeleteProfileModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteProfileModalComponent -); - -export default DeleteProfileModal; diff --git a/src/containers/modals/DeleteRackModal.js b/src/containers/modals/DeleteRackModal.js deleted file mode 100644 index 41bacb37..00000000 --- a/src/containers/modals/DeleteRackModal.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { closeDeleteRackModal } from "../../actions/modals/topology"; -import { deleteRack } from "../../actions/topology/rack"; -import ConfirmationModal from "../../components/modals/ConfirmationModal"; - -const DeleteRackModalComponent = ({ visible, callback }) => ( - <ConfirmationModal - title="Delete this rack" - message="Are you sure you want to delete this rack?" - show={visible} - callback={callback} - /> -); - -const mapStateToProps = state => { - return { - visible: state.modals.deleteRackModalVisible - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteRack()); - } - dispatch(closeDeleteRackModal()); - } - }; -}; - -const DeleteRackModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteRackModalComponent -); - -export default DeleteRackModal; diff --git a/src/containers/modals/DeleteRoomModal.js b/src/containers/modals/DeleteRoomModal.js deleted file mode 100644 index 339ff22c..00000000 --- a/src/containers/modals/DeleteRoomModal.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { closeDeleteRoomModal } from "../../actions/modals/topology"; -import { deleteRoom } from "../../actions/topology/room"; -import ConfirmationModal from "../../components/modals/ConfirmationModal"; - -const DeleteRoomModalComponent = ({ visible, callback }) => ( - <ConfirmationModal - title="Delete this room" - message="Are you sure you want to delete this room?" - show={visible} - callback={callback} - /> -); - -const mapStateToProps = state => { - return { - visible: state.modals.deleteRoomModalVisible - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteRoom()); - } - dispatch(closeDeleteRoomModal()); - } - }; -}; - -const DeleteRoomModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteRoomModalComponent -); - -export default DeleteRoomModal; diff --git a/src/containers/modals/EditRackNameModal.js b/src/containers/modals/EditRackNameModal.js deleted file mode 100644 index 748e847b..00000000 --- a/src/containers/modals/EditRackNameModal.js +++ /dev/null @@ -1,44 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { closeEditRackNameModal } from "../../actions/modals/topology"; -import { editRackName } from "../../actions/topology/rack"; -import TextInputModal from "../../components/modals/TextInputModal"; - -const EditRackNameModalComponent = ({ visible, previousName, callback }) => ( - <TextInputModal - title="Edit rack name" - label="Rack name" - show={visible} - initialValue={previousName} - callback={callback} - /> -); - -const mapStateToProps = state => { - return { - visible: state.modals.editRackNameModalVisible, - previousName: - state.interactionLevel.mode === "RACK" - ? state.objects.rack[ - state.objects.tile[state.interactionLevel.tileId].objectId - ].name - : "" - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: name => { - if (name) { - dispatch(editRackName(name)); - } - dispatch(closeEditRackNameModal()); - } - }; -}; - -const EditRackNameModal = connect(mapStateToProps, mapDispatchToProps)( - EditRackNameModalComponent -); - -export default EditRackNameModal; diff --git a/src/containers/modals/EditRoomNameModal.js b/src/containers/modals/EditRoomNameModal.js deleted file mode 100644 index be6c547c..00000000 --- a/src/containers/modals/EditRoomNameModal.js +++ /dev/null @@ -1,42 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { closeEditRoomNameModal } from "../../actions/modals/topology"; -import { editRoomName } from "../../actions/topology/room"; -import TextInputModal from "../../components/modals/TextInputModal"; - -const EditRoomNameModalComponent = ({ visible, previousName, callback }) => ( - <TextInputModal - title="Edit room name" - label="Room name" - show={visible} - initialValue={previousName} - callback={callback} - /> -); - -const mapStateToProps = state => { - return { - visible: state.modals.editRoomNameModalVisible, - previousName: - state.interactionLevel.mode === "ROOM" - ? state.objects.room[state.interactionLevel.roomId].name - : "" - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: name => { - if (name) { - dispatch(editRoomName(name)); - } - dispatch(closeEditRoomNameModal()); - } - }; -}; - -const EditRoomNameModal = connect(mapStateToProps, mapDispatchToProps)( - EditRoomNameModalComponent -); - -export default EditRoomNameModal; diff --git a/src/containers/modals/NewExperimentModal.js b/src/containers/modals/NewExperimentModal.js deleted file mode 100644 index c703c39a..00000000 --- a/src/containers/modals/NewExperimentModal.js +++ /dev/null @@ -1,39 +0,0 @@ -import { connect } from "react-redux"; -import { addExperiment } from "../../actions/experiments"; -import { closeNewExperimentModal } from "../../actions/modals/experiments"; -import NewExperimentModalComponent from "../../components/modals/custom-components/NewExperimentModalComponent"; - -const mapStateToProps = state => { - return { - show: state.modals.newExperimentModalVisible, - paths: Object.values(state.objects.path).filter( - path => path.simulationId === state.currentSimulationId - ), - traces: Object.values(state.objects.trace), - schedulers: Object.values(state.objects.scheduler) - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: (name, pathId, traceId, schedulerName) => { - if (name) { - dispatch( - addExperiment({ - name, - pathId, - traceId, - schedulerName - }) - ); - } - dispatch(closeNewExperimentModal()); - } - }; -}; - -const NewExperimentModal = connect(mapStateToProps, mapDispatchToProps)( - NewExperimentModalComponent -); - -export default NewExperimentModal; diff --git a/src/containers/modals/NewSimulationModal.js b/src/containers/modals/NewSimulationModal.js deleted file mode 100644 index 80789cd2..00000000 --- a/src/containers/modals/NewSimulationModal.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { closeNewSimulationModal } from "../../actions/modals/simulations"; -import { addSimulation } from "../../actions/simulations"; -import TextInputModal from "../../components/modals/TextInputModal"; - -const NewSimulationModalComponent = ({ visible, callback }) => ( - <TextInputModal - title="New Simulation" - label="Simulation title" - show={visible} - callback={callback} - /> -); - -const mapStateToProps = state => { - return { - visible: state.modals.newSimulationModalVisible - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: text => { - if (text) { - dispatch(addSimulation(text)); - } - dispatch(closeNewSimulationModal()); - } - }; -}; - -const NewSimulationModal = connect(mapStateToProps, mapDispatchToProps)( - NewSimulationModalComponent -); - -export default NewSimulationModal; diff --git a/src/containers/simulations/FilterLink.js b/src/containers/simulations/FilterLink.js deleted file mode 100644 index 2c5f4ed5..00000000 --- a/src/containers/simulations/FilterLink.js +++ /dev/null @@ -1,19 +0,0 @@ -import { connect } from "react-redux"; -import { setAuthVisibilityFilter } from "../../actions/simulations"; -import FilterButton from "../../components/simulations/FilterButton"; - -const mapStateToProps = (state, ownProps) => { - return { - active: state.simulationList.authVisibilityFilter === ownProps.filter - }; -}; - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onClick: () => dispatch(setAuthVisibilityFilter(ownProps.filter)) - }; -}; - -const FilterLink = connect(mapStateToProps, mapDispatchToProps)(FilterButton); - -export default FilterLink; diff --git a/src/containers/simulations/NewSimulationButtonContainer.js b/src/containers/simulations/NewSimulationButtonContainer.js deleted file mode 100644 index 3ea04d24..00000000 --- a/src/containers/simulations/NewSimulationButtonContainer.js +++ /dev/null @@ -1,15 +0,0 @@ -import { connect } from "react-redux"; -import { openNewSimulationModal } from "../../actions/modals/simulations"; -import NewSimulationButtonComponent from "../../components/simulations/NewSimulationButtonComponent"; - -const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(openNewSimulationModal()) - }; -}; - -const NewSimulationButtonContainer = connect(undefined, mapDispatchToProps)( - NewSimulationButtonComponent -); - -export default NewSimulationButtonContainer; diff --git a/src/containers/simulations/SimulationActions.js b/src/containers/simulations/SimulationActions.js deleted file mode 100644 index 32243eff..00000000 --- a/src/containers/simulations/SimulationActions.js +++ /dev/null @@ -1,22 +0,0 @@ -import { connect } from "react-redux"; -import { deleteSimulation } from "../../actions/simulations"; -import SimulationActionButtons from "../../components/simulations/SimulationActionButtons"; - -const mapStateToProps = (state, ownProps) => { - return { - simulationId: ownProps.simulationId - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onViewUsers: id => {}, // TODO implement user viewing - onDelete: id => dispatch(deleteSimulation(id)) - }; -}; - -const SimulationActions = connect(mapStateToProps, mapDispatchToProps)( - SimulationActionButtons -); - -export default SimulationActions; diff --git a/src/containers/simulations/VisibleSimulationAuthList.js b/src/containers/simulations/VisibleSimulationAuthList.js deleted file mode 100644 index ffc74d9e..00000000 --- a/src/containers/simulations/VisibleSimulationAuthList.js +++ /dev/null @@ -1,42 +0,0 @@ -import { connect } from "react-redux"; -import SimulationList from "../../components/simulations/SimulationAuthList"; - -const getVisibleSimulationAuths = (simulationAuths, filter) => { - switch (filter) { - case "SHOW_ALL": - return simulationAuths; - case "SHOW_OWN": - return simulationAuths.filter( - simulationAuth => simulationAuth.authorizationLevel === "OWN" - ); - case "SHOW_SHARED": - return simulationAuths.filter( - simulationAuth => simulationAuth.authorizationLevel !== "OWN" - ); - default: - return simulationAuths; - } -}; - -const mapStateToProps = state => { - const denormalizedAuthorizations = state.simulationList.authorizationsOfCurrentUser.map( - authorizationIds => { - const authorization = state.objects.authorization[authorizationIds]; - authorization.user = state.objects.user[authorization.userId]; - authorization.simulation = - state.objects.simulation[authorization.simulationId]; - return authorization; - } - ); - - return { - authorizations: getVisibleSimulationAuths( - denormalizedAuthorizations, - state.simulationList.authVisibilityFilter - ) - }; -}; - -const VisibleSimulationAuthList = connect(mapStateToProps)(SimulationList); - -export default VisibleSimulationAuthList; |