From de8f12d74faef5fa3f9e38d1340948cab2d06ea3 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 1 Jul 2020 13:33:31 +0200 Subject: Manually generate IDs --- .../src/containers/modals/DeleteMachineModal.js | 54 ++++++++--------- .../src/containers/modals/DeleteProfileModal.js | 54 ++++++++--------- frontend/src/containers/modals/DeleteRackModal.js | 54 ++++++++--------- frontend/src/containers/modals/DeleteRoomModal.js | 54 ++++++++--------- .../src/containers/modals/EditRackNameModal.js | 68 +++++++++++----------- .../src/containers/modals/EditRoomNameModal.js | 64 ++++++++++---------- .../src/containers/modals/NewExperimentModal.js | 62 ++++++++++---------- .../src/containers/modals/NewSimulationModal.js | 54 ++++++++--------- 8 files changed, 232 insertions(+), 232 deletions(-) (limited to 'frontend/src/containers/modals') diff --git a/frontend/src/containers/modals/DeleteMachineModal.js b/frontend/src/containers/modals/DeleteMachineModal.js index eba37833..02dfe8bb 100644 --- a/frontend/src/containers/modals/DeleteMachineModal.js +++ b/frontend/src/containers/modals/DeleteMachineModal.js @@ -1,37 +1,37 @@ -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"; +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 }) => ( - -); + +) const mapStateToProps = state => { - return { - visible: state.modals.deleteMachineModalVisible - }; -}; + return { + visible: state.modals.deleteMachineModalVisible, + } +} const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteMachine()); - } - dispatch(closeDeleteMachineModal()); + return { + callback: isConfirmed => { + if (isConfirmed) { + dispatch(deleteMachine()) + } + dispatch(closeDeleteMachineModal()) + }, } - }; -}; +} const DeleteMachineModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteMachineModalComponent -); + DeleteMachineModalComponent, +) -export default DeleteMachineModal; +export default DeleteMachineModal diff --git a/frontend/src/containers/modals/DeleteProfileModal.js b/frontend/src/containers/modals/DeleteProfileModal.js index 674e9408..7518c4ba 100644 --- a/frontend/src/containers/modals/DeleteProfileModal.js +++ b/frontend/src/containers/modals/DeleteProfileModal.js @@ -1,37 +1,37 @@ -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"; +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 }) => ( - -); + +) const mapStateToProps = state => { - return { - visible: state.modals.deleteProfileModalVisible - }; -}; + return { + visible: state.modals.deleteProfileModalVisible, + } +} const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteCurrentUser()); - } - dispatch(closeDeleteProfileModal()); + return { + callback: isConfirmed => { + if (isConfirmed) { + dispatch(deleteCurrentUser()) + } + dispatch(closeDeleteProfileModal()) + }, } - }; -}; +} const DeleteProfileModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteProfileModalComponent -); + DeleteProfileModalComponent, +) -export default DeleteProfileModal; +export default DeleteProfileModal diff --git a/frontend/src/containers/modals/DeleteRackModal.js b/frontend/src/containers/modals/DeleteRackModal.js index 41bacb37..a271522d 100644 --- a/frontend/src/containers/modals/DeleteRackModal.js +++ b/frontend/src/containers/modals/DeleteRackModal.js @@ -1,37 +1,37 @@ -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"; +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 }) => ( - -); + +) const mapStateToProps = state => { - return { - visible: state.modals.deleteRackModalVisible - }; -}; + return { + visible: state.modals.deleteRackModalVisible, + } +} const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteRack()); - } - dispatch(closeDeleteRackModal()); + return { + callback: isConfirmed => { + if (isConfirmed) { + dispatch(deleteRack()) + } + dispatch(closeDeleteRackModal()) + }, } - }; -}; +} const DeleteRackModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteRackModalComponent -); + DeleteRackModalComponent, +) -export default DeleteRackModal; +export default DeleteRackModal diff --git a/frontend/src/containers/modals/DeleteRoomModal.js b/frontend/src/containers/modals/DeleteRoomModal.js index 339ff22c..71f2f040 100644 --- a/frontend/src/containers/modals/DeleteRoomModal.js +++ b/frontend/src/containers/modals/DeleteRoomModal.js @@ -1,37 +1,37 @@ -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"; +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 }) => ( - -); + +) const mapStateToProps = state => { - return { - visible: state.modals.deleteRoomModalVisible - }; -}; + return { + visible: state.modals.deleteRoomModalVisible, + } +} const mapDispatchToProps = dispatch => { - return { - callback: isConfirmed => { - if (isConfirmed) { - dispatch(deleteRoom()); - } - dispatch(closeDeleteRoomModal()); + return { + callback: isConfirmed => { + if (isConfirmed) { + dispatch(deleteRoom()) + } + dispatch(closeDeleteRoomModal()) + }, } - }; -}; +} const DeleteRoomModal = connect(mapStateToProps, mapDispatchToProps)( - DeleteRoomModalComponent -); + DeleteRoomModalComponent, +) -export default DeleteRoomModal; +export default DeleteRoomModal diff --git a/frontend/src/containers/modals/EditRackNameModal.js b/frontend/src/containers/modals/EditRackNameModal.js index 748e847b..e5c87e35 100644 --- a/frontend/src/containers/modals/EditRackNameModal.js +++ b/frontend/src/containers/modals/EditRackNameModal.js @@ -1,44 +1,44 @@ -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"; +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 }) => ( - -); + +) const mapStateToProps = state => { - return { - visible: state.modals.editRackNameModalVisible, - previousName: - state.interactionLevel.mode === "RACK" - ? state.objects.rack[ - state.objects.tile[state.interactionLevel.tileId].objectId - ].name - : "" - }; -}; + 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()); + return { + callback: name => { + if (name) { + dispatch(editRackName(name)) + } + dispatch(closeEditRackNameModal()) + }, } - }; -}; +} const EditRackNameModal = connect(mapStateToProps, mapDispatchToProps)( - EditRackNameModalComponent -); + EditRackNameModalComponent, +) -export default EditRackNameModal; +export default EditRackNameModal diff --git a/frontend/src/containers/modals/EditRoomNameModal.js b/frontend/src/containers/modals/EditRoomNameModal.js index be6c547c..973216ac 100644 --- a/frontend/src/containers/modals/EditRoomNameModal.js +++ b/frontend/src/containers/modals/EditRoomNameModal.js @@ -1,42 +1,42 @@ -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"; +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 }) => ( - -); + +) const mapStateToProps = state => { - return { - visible: state.modals.editRoomNameModalVisible, - previousName: - state.interactionLevel.mode === "ROOM" - ? state.objects.room[state.interactionLevel.roomId].name - : "" - }; -}; + 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()); + return { + callback: name => { + if (name) { + dispatch(editRoomName(name)) + } + dispatch(closeEditRoomNameModal()) + }, } - }; -}; +} const EditRoomNameModal = connect(mapStateToProps, mapDispatchToProps)( - EditRoomNameModalComponent -); + EditRoomNameModalComponent, +) -export default EditRoomNameModal; +export default EditRoomNameModal diff --git a/frontend/src/containers/modals/NewExperimentModal.js b/frontend/src/containers/modals/NewExperimentModal.js index c703c39a..db60f088 100644 --- a/frontend/src/containers/modals/NewExperimentModal.js +++ b/frontend/src/containers/modals/NewExperimentModal.js @@ -1,39 +1,39 @@ -import { connect } from "react-redux"; -import { addExperiment } from "../../actions/experiments"; -import { closeNewExperimentModal } from "../../actions/modals/experiments"; -import NewExperimentModalComponent from "../../components/modals/custom-components/NewExperimentModalComponent"; +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) - }; -}; + 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()); + return { + callback: (name, pathId, traceId, schedulerName) => { + if (name) { + dispatch( + addExperiment({ + name, + pathId, + traceId, + schedulerName, + }), + ) + } + dispatch(closeNewExperimentModal()) + }, } - }; -}; +} const NewExperimentModal = connect(mapStateToProps, mapDispatchToProps)( - NewExperimentModalComponent -); + NewExperimentModalComponent, +) -export default NewExperimentModal; +export default NewExperimentModal diff --git a/frontend/src/containers/modals/NewSimulationModal.js b/frontend/src/containers/modals/NewSimulationModal.js index 80789cd2..e95ac4b0 100644 --- a/frontend/src/containers/modals/NewSimulationModal.js +++ b/frontend/src/containers/modals/NewSimulationModal.js @@ -1,37 +1,37 @@ -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"; +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 }) => ( - -); + +) const mapStateToProps = state => { - return { - visible: state.modals.newSimulationModalVisible - }; -}; + return { + visible: state.modals.newSimulationModalVisible, + } +} const mapDispatchToProps = dispatch => { - return { - callback: text => { - if (text) { - dispatch(addSimulation(text)); - } - dispatch(closeNewSimulationModal()); + return { + callback: text => { + if (text) { + dispatch(addSimulation(text)) + } + dispatch(closeNewSimulationModal()) + }, } - }; -}; +} const NewSimulationModal = connect(mapStateToProps, mapDispatchToProps)( - NewSimulationModalComponent -); + NewSimulationModalComponent, +) -export default NewSimulationModal; +export default NewSimulationModal -- cgit v1.2.3