diff options
Diffstat (limited to 'src/containers')
14 files changed, 15 insertions, 15 deletions
diff --git a/src/containers/map/layers/ObjectHoverLayer.js b/src/containers/map/layers/ObjectHoverLayer.js index 138daa2c..d0cc35fd 100644 --- a/src/containers/map/layers/ObjectHoverLayer.js +++ b/src/containers/map/layers/ObjectHoverLayer.js @@ -1,5 +1,5 @@ import {connect} from "react-redux"; -import {addRackToTile} from "../../../actions/topology"; +import {addRackToTile} from "../../../actions/topology/room"; import ObjectHoverLayerComponent from "../../../components/map/layers/ObjectHoverLayerComponent"; import {findTileWithPosition} from "../../../util/tile-calculations"; diff --git a/src/containers/map/layers/RoomHoverLayer.js b/src/containers/map/layers/RoomHoverLayer.js index 188ee51a..23f590d5 100644 --- a/src/containers/map/layers/RoomHoverLayer.js +++ b/src/containers/map/layers/RoomHoverLayer.js @@ -1,5 +1,5 @@ import {connect} from "react-redux"; -import {toggleTileAtLocation} from "../../../actions/topology"; +import {toggleTileAtLocation} from "../../../actions/topology/building"; import RoomHoverLayerComponent from "../../../components/map/layers/RoomHoverLayerComponent"; import { deriveValidNextTilePositions, diff --git a/src/containers/modals/DeleteMachineModal.js b/src/containers/modals/DeleteMachineModal.js index aeb42024..c2b658d9 100644 --- a/src/containers/modals/DeleteMachineModal.js +++ b/src/containers/modals/DeleteMachineModal.js @@ -1,7 +1,7 @@ import React from "react"; import {connect} from "react-redux"; import {closeDeleteMachineModal} from "../../actions/modals/topology"; -import {deleteMachine} from "../../actions/topology"; +import {deleteMachine} from "../../actions/topology/machine"; import ConfirmationModal from "../../components/modals/ConfirmationModal"; const DeleteMachineModalComponent = ({visible, callback}) => ( diff --git a/src/containers/modals/DeleteRackModal.js b/src/containers/modals/DeleteRackModal.js index 00dd036c..6515ab96 100644 --- a/src/containers/modals/DeleteRackModal.js +++ b/src/containers/modals/DeleteRackModal.js @@ -1,7 +1,7 @@ import React from "react"; import {connect} from "react-redux"; import {closeDeleteRackModal} from "../../actions/modals/topology"; -import {deleteRack} from "../../actions/topology"; +import {deleteRack} from "../../actions/topology/rack"; import ConfirmationModal from "../../components/modals/ConfirmationModal"; const DeleteRackModalComponent = ({visible, callback}) => ( diff --git a/src/containers/modals/DeleteRoomModal.js b/src/containers/modals/DeleteRoomModal.js index 92684385..a32c9ca1 100644 --- a/src/containers/modals/DeleteRoomModal.js +++ b/src/containers/modals/DeleteRoomModal.js @@ -1,7 +1,7 @@ import React from "react"; import {connect} from "react-redux"; import {closeDeleteRoomModal} from "../../actions/modals/topology"; -import {deleteRoom} from "../../actions/topology"; +import {deleteRoom} from "../../actions/topology/room"; import ConfirmationModal from "../../components/modals/ConfirmationModal"; const DeleteRoomModalComponent = ({visible, callback}) => ( diff --git a/src/containers/modals/EditRackNameModal.js b/src/containers/modals/EditRackNameModal.js index e793f146..6f638bbc 100644 --- a/src/containers/modals/EditRackNameModal.js +++ b/src/containers/modals/EditRackNameModal.js @@ -1,7 +1,7 @@ import React from "react"; import {connect} from "react-redux"; import {closeEditRackNameModal} from "../../actions/modals/topology"; -import {editRackName} from "../../actions/topology"; +import {editRackName} from "../../actions/topology/rack"; import TextInputModal from "../../components/modals/TextInputModal"; const EditRackNameModalComponent = ({visible, previousName, callback}) => ( diff --git a/src/containers/modals/EditRoomNameModal.js b/src/containers/modals/EditRoomNameModal.js index 649ffeda..be6230d0 100644 --- a/src/containers/modals/EditRoomNameModal.js +++ b/src/containers/modals/EditRoomNameModal.js @@ -1,7 +1,7 @@ import React from "react"; import {connect} from "react-redux"; import {closeEditRoomNameModal} from "../../actions/modals/topology"; -import {editRoomName} from "../../actions/topology"; +import {editRoomName} from "../../actions/topology/room"; import TextInputModal from "../../components/modals/TextInputModal"; const EditRoomNameModalComponent = ({visible, previousName, callback}) => ( diff --git a/src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js b/src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js index 6061da96..399c7a0d 100644 --- a/src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js +++ b/src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js @@ -1,5 +1,5 @@ import {connect} from "react-redux"; -import {cancelNewRoomConstruction} from "../../../../actions/topology"; +import {cancelNewRoomConstruction} from "../../../../actions/topology/building"; import CancelNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/CancelNewRoomConstructionComponent"; const mapDispatchToProps = dispatch => { diff --git a/src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js b/src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js index ca34dcc3..8fc192e0 100644 --- a/src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js +++ b/src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js @@ -1,5 +1,5 @@ import {connect} from "react-redux"; -import {finishNewRoomConstruction} from "../../../../actions/topology"; +import {finishNewRoomConstruction} from "../../../../actions/topology/building"; import FinishNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/FinishNewRoomConstructionComponent"; const mapDispatchToProps = dispatch => { diff --git a/src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js b/src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js index f26eb5d4..c2c9808a 100644 --- a/src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js +++ b/src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js @@ -1,5 +1,5 @@ import {connect} from "react-redux"; -import {startNewRoomConstruction} from "../../../../actions/topology"; +import {startNewRoomConstruction} from "../../../../actions/topology/building"; import StartNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/StartNewRoomConstructionComponent"; const mapDispatchToProps = dispatch => { diff --git a/src/containers/sidebars/topology/rack/EmptySlotContainer.js b/src/containers/sidebars/topology/rack/EmptySlotContainer.js index 01ec6529..97abf473 100644 --- a/src/containers/sidebars/topology/rack/EmptySlotContainer.js +++ b/src/containers/sidebars/topology/rack/EmptySlotContainer.js @@ -1,5 +1,5 @@ import {connect} from "react-redux"; -import {addMachine} from "../../../../actions/topology"; +import {addMachine} from "../../../../actions/topology/rack"; import EmptySlotComponent from "../../../../components/sidebars/topology/rack/EmptySlotComponent"; const mapDispatchToProps = (dispatch, ownProps) => { diff --git a/src/containers/sidebars/topology/room/RackConstructionContainer.js b/src/containers/sidebars/topology/room/RackConstructionContainer.js index 47ca43fc..0c539c75 100644 --- a/src/containers/sidebars/topology/room/RackConstructionContainer.js +++ b/src/containers/sidebars/topology/room/RackConstructionContainer.js @@ -1,5 +1,5 @@ import {connect} from "react-redux"; -import {startRackConstruction, stopRackConstruction} from "../../../../actions/topology"; +import {startRackConstruction, stopRackConstruction} from "../../../../actions/topology/room"; import RackConstructionComponent from "../../../../components/sidebars/topology/room/RackConstructionComponent"; const mapStateToProps = state => { diff --git a/src/containers/simulations/FilterLink.js b/src/containers/simulations/FilterLink.js index dff01ab2..00d8f722 100644 --- a/src/containers/simulations/FilterLink.js +++ b/src/containers/simulations/FilterLink.js @@ -4,7 +4,7 @@ import FilterButton from "../../components/simulations/FilterButton"; const mapStateToProps = (state, ownProps) => { return { - active: state.authVisibilityFilter === ownProps.filter + active: state.simulationList.authVisibilityFilter === ownProps.filter }; }; diff --git a/src/containers/simulations/VisibleSimulationAuthList.js b/src/containers/simulations/VisibleSimulationAuthList.js index 2a676e73..578ae303 100644 --- a/src/containers/simulations/VisibleSimulationAuthList.js +++ b/src/containers/simulations/VisibleSimulationAuthList.js @@ -16,12 +16,12 @@ const getVisibleSimulationAuths = (simulationAuths, filter) => { }; const mapStateToProps = state => { - const denormalizedAuthorizations = state.authorizationsOfCurrentUser.map(authorizationIds => + const denormalizedAuthorizations = state.simulationList.authorizationsOfCurrentUser.map(authorizationIds => denormalize(state, "authorization", authorizationIds) ); return { - authorizations: getVisibleSimulationAuths(denormalizedAuthorizations, state.authVisibilityFilter) + authorizations: getVisibleSimulationAuths(denormalizedAuthorizations, state.simulationList.authVisibilityFilter) }; }; |