From 912e1b96bfa7d6c022d854fa744f719b49ca98d0 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 21 Jul 2020 15:33:37 +0200 Subject: Add first plotting attempts for portfolios --- .../src/containers/modals/DeleteMachineModal.js | 10 ++++----- .../src/containers/modals/DeleteProfileModal.js | 10 ++++----- frontend/src/containers/modals/DeleteRackModal.js | 10 ++++----- frontend/src/containers/modals/DeleteRoomModal.js | 10 ++++----- .../src/containers/modals/EditRackNameModal.js | 14 +++++-------- .../src/containers/modals/EditRoomNameModal.js | 14 +++++-------- .../src/containers/modals/NewPortfolioModal.js | 12 +++++------ frontend/src/containers/modals/NewProjectModal.js | 17 +++++---------- frontend/src/containers/modals/NewScenarioModal.js | 19 ++++++++--------- frontend/src/containers/modals/NewTopologyModal.js | 24 ++++++++-------------- 10 files changed, 54 insertions(+), 86 deletions(-) (limited to 'frontend/src/containers/modals') diff --git a/frontend/src/containers/modals/DeleteMachineModal.js b/frontend/src/containers/modals/DeleteMachineModal.js index 02dfe8bb..f30febdb 100644 --- a/frontend/src/containers/modals/DeleteMachineModal.js +++ b/frontend/src/containers/modals/DeleteMachineModal.js @@ -13,15 +13,15 @@ const DeleteMachineModalComponent = ({ visible, callback }) => ( /> ) -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { visible: state.modals.deleteMachineModalVisible, } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { - callback: isConfirmed => { + callback: (isConfirmed) => { if (isConfirmed) { dispatch(deleteMachine()) } @@ -30,8 +30,6 @@ const mapDispatchToProps = dispatch => { } } -const DeleteMachineModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteMachineModalComponent, -) +const DeleteMachineModal = connect(mapStateToProps, mapDispatchToProps)(DeleteMachineModalComponent) export default DeleteMachineModal diff --git a/frontend/src/containers/modals/DeleteProfileModal.js b/frontend/src/containers/modals/DeleteProfileModal.js index 7518c4ba..e7c4014d 100644 --- a/frontend/src/containers/modals/DeleteProfileModal.js +++ b/frontend/src/containers/modals/DeleteProfileModal.js @@ -13,15 +13,15 @@ const DeleteProfileModalComponent = ({ visible, callback }) => ( /> ) -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { visible: state.modals.deleteProfileModalVisible, } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { - callback: isConfirmed => { + callback: (isConfirmed) => { if (isConfirmed) { dispatch(deleteCurrentUser()) } @@ -30,8 +30,6 @@ const mapDispatchToProps = dispatch => { } } -const DeleteProfileModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteProfileModalComponent, -) +const DeleteProfileModal = connect(mapStateToProps, mapDispatchToProps)(DeleteProfileModalComponent) export default DeleteProfileModal diff --git a/frontend/src/containers/modals/DeleteRackModal.js b/frontend/src/containers/modals/DeleteRackModal.js index a271522d..0cb22a7e 100644 --- a/frontend/src/containers/modals/DeleteRackModal.js +++ b/frontend/src/containers/modals/DeleteRackModal.js @@ -13,15 +13,15 @@ const DeleteRackModalComponent = ({ visible, callback }) => ( /> ) -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { visible: state.modals.deleteRackModalVisible, } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { - callback: isConfirmed => { + callback: (isConfirmed) => { if (isConfirmed) { dispatch(deleteRack()) } @@ -30,8 +30,6 @@ const mapDispatchToProps = dispatch => { } } -const DeleteRackModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteRackModalComponent, -) +const DeleteRackModal = connect(mapStateToProps, mapDispatchToProps)(DeleteRackModalComponent) export default DeleteRackModal diff --git a/frontend/src/containers/modals/DeleteRoomModal.js b/frontend/src/containers/modals/DeleteRoomModal.js index 71f2f040..1f6eef92 100644 --- a/frontend/src/containers/modals/DeleteRoomModal.js +++ b/frontend/src/containers/modals/DeleteRoomModal.js @@ -13,15 +13,15 @@ const DeleteRoomModalComponent = ({ visible, callback }) => ( /> ) -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { visible: state.modals.deleteRoomModalVisible, } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { - callback: isConfirmed => { + callback: (isConfirmed) => { if (isConfirmed) { dispatch(deleteRoom()) } @@ -30,8 +30,6 @@ const mapDispatchToProps = dispatch => { } } -const DeleteRoomModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteRoomModalComponent, -) +const DeleteRoomModal = connect(mapStateToProps, mapDispatchToProps)(DeleteRoomModalComponent) export default DeleteRoomModal diff --git a/frontend/src/containers/modals/EditRackNameModal.js b/frontend/src/containers/modals/EditRackNameModal.js index fb7727f1..9128f449 100644 --- a/frontend/src/containers/modals/EditRackNameModal.js +++ b/frontend/src/containers/modals/EditRackNameModal.js @@ -14,21 +14,19 @@ const EditRackNameModalComponent = ({ visible, previousName, callback }) => ( /> ) -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { visible: state.modals.editRackNameModalVisible, previousName: state.interactionLevel.mode === 'RACK' - ? state.objects.rack[ - state.objects.tile[state.interactionLevel.tileId].rackId - ].name + ? state.objects.rack[state.objects.tile[state.interactionLevel.tileId].rackId].name : '', } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { - callback: name => { + callback: (name) => { if (name) { dispatch(editRackName(name)) } @@ -37,8 +35,6 @@ const mapDispatchToProps = dispatch => { } } -const EditRackNameModal = connect(mapStateToProps, mapDispatchToProps)( - EditRackNameModalComponent, -) +const EditRackNameModal = connect(mapStateToProps, mapDispatchToProps)(EditRackNameModalComponent) export default EditRackNameModal diff --git a/frontend/src/containers/modals/EditRoomNameModal.js b/frontend/src/containers/modals/EditRoomNameModal.js index 973216ac..8032a5d1 100644 --- a/frontend/src/containers/modals/EditRoomNameModal.js +++ b/frontend/src/containers/modals/EditRoomNameModal.js @@ -14,19 +14,17 @@ const EditRoomNameModalComponent = ({ visible, previousName, callback }) => ( /> ) -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { visible: state.modals.editRoomNameModalVisible, previousName: - state.interactionLevel.mode === 'ROOM' - ? state.objects.room[state.interactionLevel.roomId].name - : '', + state.interactionLevel.mode === 'ROOM' ? state.objects.room[state.interactionLevel.roomId].name : '', } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { - callback: name => { + callback: (name) => { if (name) { dispatch(editRoomName(name)) } @@ -35,8 +33,6 @@ const mapDispatchToProps = dispatch => { } } -const EditRoomNameModal = connect(mapStateToProps, mapDispatchToProps)( - EditRoomNameModalComponent, -) +const EditRoomNameModal = connect(mapStateToProps, mapDispatchToProps)(EditRoomNameModalComponent) export default EditRoomNameModal diff --git a/frontend/src/containers/modals/NewPortfolioModal.js b/frontend/src/containers/modals/NewPortfolioModal.js index 5c4644d5..6cf12d8e 100644 --- a/frontend/src/containers/modals/NewPortfolioModal.js +++ b/frontend/src/containers/modals/NewPortfolioModal.js @@ -3,21 +3,21 @@ import NewPortfolioModalComponent from '../../components/modals/custom-component import { addPortfolio } from '../../actions/portfolios' import { closeNewPortfolioModal } from '../../actions/modals/portfolios' -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { show: state.modals.newPortfolioModalVisible, } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { callback: (name, targets) => { if (name) { dispatch( addPortfolio({ name, - targets - }), + targets, + }) ) } dispatch(closeNewPortfolioModal()) @@ -25,8 +25,6 @@ const mapDispatchToProps = dispatch => { } } -const NewPortfolioModal = connect(mapStateToProps, mapDispatchToProps)( - NewPortfolioModalComponent, -) +const NewPortfolioModal = connect(mapStateToProps, mapDispatchToProps)(NewPortfolioModalComponent) export default NewPortfolioModal diff --git a/frontend/src/containers/modals/NewProjectModal.js b/frontend/src/containers/modals/NewProjectModal.js index 1d0ebbbc..d306dc45 100644 --- a/frontend/src/containers/modals/NewProjectModal.js +++ b/frontend/src/containers/modals/NewProjectModal.js @@ -5,23 +5,18 @@ import { addProject } from '../../actions/projects' import TextInputModal from '../../components/modals/TextInputModal' const NewProjectModalComponent = ({ visible, callback }) => ( - + ) -const mapStateToProps = state => { +const mapStateToProps = (state) => { return { visible: state.modals.newProjectModalVisible, } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { - callback: text => { + callback: (text) => { if (text) { dispatch(addProject(text)) } @@ -30,8 +25,6 @@ const mapDispatchToProps = dispatch => { } } -const NewProjectModal = connect(mapStateToProps, mapDispatchToProps)( - NewProjectModalComponent, -) +const NewProjectModal = connect(mapStateToProps, mapDispatchToProps)(NewProjectModalComponent) export default NewProjectModal diff --git a/frontend/src/containers/modals/NewScenarioModal.js b/frontend/src/containers/modals/NewScenarioModal.js index 0b273ed0..6a87d697 100644 --- a/frontend/src/containers/modals/NewScenarioModal.js +++ b/frontend/src/containers/modals/NewScenarioModal.js @@ -3,11 +3,12 @@ import NewScenarioModalComponent from '../../components/modals/custom-components import { addScenario } from '../../actions/scenarios' import { closeNewScenarioModal } from '../../actions/modals/scenarios' -const mapStateToProps = state => { - let topologies = state.currentProjectId !== '-1' ? 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.currentProjectId !== '-1' + ? state.objects.project[state.currentProjectId].topologyIds.map((t) => state.objects.topology[t]) + : [] + if (topologies.filter((t) => !t).length > 0) { topologies = [] } @@ -20,7 +21,7 @@ const mapStateToProps = state => { } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { callback: (name, portfolioId, trace, topology, operational) => { if (name) { @@ -31,7 +32,7 @@ const mapDispatchToProps = dispatch => { trace, topology, operational, - }), + }) ) } dispatch(closeNewScenarioModal()) @@ -39,8 +40,6 @@ const mapDispatchToProps = dispatch => { } } -const NewScenarioModal = connect(mapStateToProps, mapDispatchToProps)( - NewScenarioModalComponent, -) +const NewScenarioModal = connect(mapStateToProps, mapDispatchToProps)(NewScenarioModalComponent) export default NewScenarioModal diff --git a/frontend/src/containers/modals/NewTopologyModal.js b/frontend/src/containers/modals/NewTopologyModal.js index 282f0db9..99c42367 100644 --- a/frontend/src/containers/modals/NewTopologyModal.js +++ b/frontend/src/containers/modals/NewTopologyModal.js @@ -3,11 +3,11 @@ import NewTopologyModalComponent from '../../components/modals/custom-components import { closeNewTopologyModal } from '../../actions/modals/topology' import { addTopology } from '../../actions/topologies' -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 = [] } @@ -17,22 +17,18 @@ const mapStateToProps = state => { } } -const mapDispatchToProps = dispatch => { +const mapDispatchToProps = (dispatch) => { return { onCreateTopology: (name) => { if (name) { - dispatch( - addTopology({ name, rooms: [] }), - ) + dispatch(addTopology({ name, rooms: [] })) } dispatch(closeNewTopologyModal()) }, onDuplicateTopology: (name) => { if (name) { // TODO different handling here - dispatch( - addTopology({ name, rooms: [] }), - ) + dispatch(addTopology({ name, rooms: [] })) } dispatch(closeNewTopologyModal()) }, @@ -42,8 +38,6 @@ const mapDispatchToProps = dispatch => { } } -const NewTopologyModal = connect(mapStateToProps, mapDispatchToProps)( - NewTopologyModalComponent, -) +const NewTopologyModal = connect(mapStateToProps, mapDispatchToProps)(NewTopologyModalComponent) export default NewTopologyModal -- cgit v1.2.3