diff options
Diffstat (limited to 'src')
7 files changed, 67 insertions, 11 deletions
diff --git a/src/components/sidebars/elements/LoadBarComponent.js b/src/components/sidebars/elements/LoadBarComponent.js index 0616d699..65f94b3d 100644 --- a/src/components/sidebars/elements/LoadBarComponent.js +++ b/src/components/sidebars/elements/LoadBarComponent.js @@ -6,7 +6,7 @@ const LoadBarComponent = ({percent, disabled}) => ( <strong>Current load</strong> <div className={classNames("progress", {disabled})}> <div - className="progress-bar progress-bar-striped" + className="progress-bar" role="progressbar" aria-valuenow={percent} aria-valuemin="0" diff --git a/src/components/sidebars/topology/rack/BackToRoomComponent.js b/src/components/sidebars/topology/rack/BackToRoomComponent.js new file mode 100644 index 00000000..9bb719a3 --- /dev/null +++ b/src/components/sidebars/topology/rack/BackToRoomComponent.js @@ -0,0 +1,9 @@ +import React from "react"; + +const BackToRoomComponent = ({onClick}) => ( + <div className="btn btn-secondary btn-block" onClick={onClick}> + Back to room + </div> +); + +export default BackToRoomComponent; diff --git a/src/components/sidebars/topology/rack/RackSidebarComponent.js b/src/components/sidebars/topology/rack/RackSidebarComponent.js index bfcc7e32..398b3c13 100644 --- a/src/components/sidebars/topology/rack/RackSidebarComponent.js +++ b/src/components/sidebars/topology/rack/RackSidebarComponent.js @@ -1,6 +1,7 @@ import React from "react"; import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer"; import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer"; +import BackToRoomContainer from "../../../../containers/sidebars/topology/rack/BackToRoomContainer"; import DeleteRackContainer from "../../../../containers/sidebars/topology/rack/DeleteRackContainer"; import MachineListContainer from "../../../../containers/sidebars/topology/rack/MachineListContainer"; import RackNameContainer from "../../../../containers/sidebars/topology/rack/RackNameContainer"; @@ -9,16 +10,19 @@ import "./RackSidebarComponent.css"; const RackSidebarComponent = ({inSimulation, rackId}) => { return ( <div className="rack-sidebar-container flex-column"> - <RackNameContainer/> - {inSimulation ? - <div> - <LoadBarContainer objectType="rack" objectId={rackId}/> - <LoadChartContainer objectType="rack" objectId={rackId}/> - </div> : - <div> - <DeleteRackContainer/> - </div> - } + <div style={{flex: 0}}> + <RackNameContainer/> + <BackToRoomContainer/> + {inSimulation ? + <div> + <LoadBarContainer objectType="rack" objectId={rackId}/> + <LoadChartContainer objectType="rack" objectId={rackId}/> + </div> : + <div> + <DeleteRackContainer/> + </div> + } + </div> <div className="machine-list-container mt-2"> <MachineListContainer/> </div> diff --git a/src/components/sidebars/topology/room/BackToBuildingComponent.js b/src/components/sidebars/topology/room/BackToBuildingComponent.js new file mode 100644 index 00000000..12dc15dd --- /dev/null +++ b/src/components/sidebars/topology/room/BackToBuildingComponent.js @@ -0,0 +1,9 @@ +import React from "react"; + +const BackToBuildingComponent = ({onClick}) => ( + <div className="btn btn-secondary btn-block" onClick={onClick}> + Back to building + </div> +); + +export default BackToBuildingComponent; diff --git a/src/components/sidebars/topology/room/RoomSidebarComponent.js b/src/components/sidebars/topology/room/RoomSidebarComponent.js index 59c5fc8f..04df4372 100644 --- a/src/components/sidebars/topology/room/RoomSidebarComponent.js +++ b/src/components/sidebars/topology/room/RoomSidebarComponent.js @@ -1,6 +1,7 @@ import React from "react"; import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer"; import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer"; +import BackToBuildingContainer from "../../../../containers/sidebars/topology/room/BackToBuildingContainer"; import DeleteRoomContainer from "../../../../containers/sidebars/topology/room/DeleteRoomContainer"; import RackConstructionContainer from "../../../../containers/sidebars/topology/room/RackConstructionContainer"; import RoomNameContainer from "../../../../containers/sidebars/topology/room/RoomNameContainer"; @@ -15,6 +16,7 @@ const RoomSidebarComponent = ({roomId, roomType, inSimulation}) => { return ( <div> <RoomNameContainer/> + <BackToBuildingContainer/> <RoomTypeContainer/> {inSimulation ? <div> diff --git a/src/containers/sidebars/topology/rack/BackToRoomContainer.js b/src/containers/sidebars/topology/rack/BackToRoomContainer.js new file mode 100644 index 00000000..876078d5 --- /dev/null +++ b/src/containers/sidebars/topology/rack/BackToRoomContainer.js @@ -0,0 +1,16 @@ +import {connect} from "react-redux"; +import {goDownOneInteractionLevel} from "../../../../actions/interaction-level"; +import BackToRoomComponent from "../../../../components/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/sidebars/topology/room/BackToBuildingContainer.js b/src/containers/sidebars/topology/room/BackToBuildingContainer.js new file mode 100644 index 00000000..5ab772f6 --- /dev/null +++ b/src/containers/sidebars/topology/room/BackToBuildingContainer.js @@ -0,0 +1,16 @@ +import {connect} from "react-redux"; +import {goDownOneInteractionLevel} from "../../../../actions/interaction-level"; +import BackToBuildingComponent from "../../../../components/sidebars/topology/room/BackToBuildingComponent"; + +const mapDispatchToProps = dispatch => { + return { + onClick: () => dispatch(goDownOneInteractionLevel()), + }; +}; + +const BackToBuildingContainer = connect( + undefined, + mapDispatchToProps +)(BackToBuildingComponent); + +export default BackToBuildingContainer; |