diff options
| author | Georgios Andreadis <info@gandreadis.com> | 2020-07-01 13:33:31 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:47:17 +0200 |
| commit | de8f12d74faef5fa3f9e38d1340948cab2d06ea3 (patch) | |
| tree | 678bf1af3e5fa2334f0df43388d45294785bbf1e /frontend/src/containers/simulations | |
| parent | 44236756c4cf689806dc17c6950a2cff3e9227bf (diff) | |
Manually generate IDs
Diffstat (limited to 'frontend/src/containers/simulations')
4 files changed, 74 insertions, 73 deletions
diff --git a/frontend/src/containers/simulations/FilterLink.js b/frontend/src/containers/simulations/FilterLink.js index 2c5f4ed5..9eedd549 100644 --- a/frontend/src/containers/simulations/FilterLink.js +++ b/frontend/src/containers/simulations/FilterLink.js @@ -1,19 +1,19 @@ -import { connect } from "react-redux"; -import { setAuthVisibilityFilter } from "../../actions/simulations"; -import FilterButton from "../../components/simulations/FilterButton"; +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 - }; -}; + return { + active: state.simulationList.authVisibilityFilter === ownProps.filter, + } +} const mapDispatchToProps = (dispatch, ownProps) => { - return { - onClick: () => dispatch(setAuthVisibilityFilter(ownProps.filter)) - }; -}; + return { + onClick: () => dispatch(setAuthVisibilityFilter(ownProps.filter)), + } +} -const FilterLink = connect(mapStateToProps, mapDispatchToProps)(FilterButton); +const FilterLink = connect(mapStateToProps, mapDispatchToProps)(FilterButton) -export default FilterLink; +export default FilterLink diff --git a/frontend/src/containers/simulations/NewSimulationButtonContainer.js b/frontend/src/containers/simulations/NewSimulationButtonContainer.js index 3ea04d24..2d7c7385 100644 --- a/frontend/src/containers/simulations/NewSimulationButtonContainer.js +++ b/frontend/src/containers/simulations/NewSimulationButtonContainer.js @@ -1,15 +1,15 @@ -import { connect } from "react-redux"; -import { openNewSimulationModal } from "../../actions/modals/simulations"; -import NewSimulationButtonComponent from "../../components/simulations/NewSimulationButtonComponent"; +import { connect } from 'react-redux' +import { openNewSimulationModal } from '../../actions/modals/simulations' +import NewSimulationButtonComponent from '../../components/simulations/NewSimulationButtonComponent' const mapDispatchToProps = dispatch => { - return { - onClick: () => dispatch(openNewSimulationModal()) - }; -}; + return { + onClick: () => dispatch(openNewSimulationModal()), + } +} const NewSimulationButtonContainer = connect(undefined, mapDispatchToProps)( - NewSimulationButtonComponent -); + NewSimulationButtonComponent, +) -export default NewSimulationButtonContainer; +export default NewSimulationButtonContainer diff --git a/frontend/src/containers/simulations/SimulationActions.js b/frontend/src/containers/simulations/SimulationActions.js index 32243eff..6c662912 100644 --- a/frontend/src/containers/simulations/SimulationActions.js +++ b/frontend/src/containers/simulations/SimulationActions.js @@ -1,22 +1,23 @@ -import { connect } from "react-redux"; -import { deleteSimulation } from "../../actions/simulations"; -import SimulationActionButtons from "../../components/simulations/SimulationActionButtons"; +import { connect } from 'react-redux' +import { deleteSimulation } from '../../actions/simulations' +import SimulationActionButtons from '../../components/simulations/SimulationActionButtons' const mapStateToProps = (state, ownProps) => { - return { - simulationId: ownProps.simulationId - }; -}; + return { + simulationId: ownProps.simulationId, + } +} const mapDispatchToProps = dispatch => { - return { - onViewUsers: id => {}, // TODO implement user viewing - onDelete: id => dispatch(deleteSimulation(id)) - }; -}; + return { + onViewUsers: id => { + }, // TODO implement user viewing + onDelete: id => dispatch(deleteSimulation(id)), + } +} const SimulationActions = connect(mapStateToProps, mapDispatchToProps)( - SimulationActionButtons -); + SimulationActionButtons, +) -export default SimulationActions; +export default SimulationActions diff --git a/frontend/src/containers/simulations/VisibleSimulationAuthList.js b/frontend/src/containers/simulations/VisibleSimulationAuthList.js index ffc74d9e..f2b30542 100644 --- a/frontend/src/containers/simulations/VisibleSimulationAuthList.js +++ b/frontend/src/containers/simulations/VisibleSimulationAuthList.js @@ -1,42 +1,42 @@ -import { connect } from "react-redux"; -import SimulationList from "../../components/simulations/SimulationAuthList"; +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; + 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 } - ); +} - return { - authorizations: getVisibleSimulationAuths( - denormalizedAuthorizations, - state.simulationList.authVisibilityFilter +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 + }, ) - }; -}; -const VisibleSimulationAuthList = connect(mapStateToProps)(SimulationList); + return { + authorizations: getVisibleSimulationAuths( + denormalizedAuthorizations, + state.simulationList.authVisibilityFilter, + ), + } +} + +const VisibleSimulationAuthList = connect(mapStateToProps)(SimulationList) -export default VisibleSimulationAuthList; +export default VisibleSimulationAuthList |
