From 07195f3762b6a8a7dfb44c2231db58c5be13c43f Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 16 Aug 2017 22:55:16 +0300 Subject: Rename project to sim and enable sim-adding --- src/containers/projects/FilterLink.js | 22 -------------- src/containers/projects/NewProjectModal.js | 34 ---------------------- src/containers/projects/ProjectActions.js | 24 --------------- src/containers/projects/VisibleProjectAuthList.js | 32 -------------------- src/containers/simulations/FilterLink.js | 22 ++++++++++++++ src/containers/simulations/NewSimulationModal.js | 34 ++++++++++++++++++++++ src/containers/simulations/SimulationActions.js | 24 +++++++++++++++ .../simulations/VisibleSimulationAuthList.js | 32 ++++++++++++++++++++ 8 files changed, 112 insertions(+), 112 deletions(-) delete mode 100644 src/containers/projects/FilterLink.js delete mode 100644 src/containers/projects/NewProjectModal.js delete mode 100644 src/containers/projects/ProjectActions.js delete mode 100644 src/containers/projects/VisibleProjectAuthList.js create mode 100644 src/containers/simulations/FilterLink.js create mode 100644 src/containers/simulations/NewSimulationModal.js create mode 100644 src/containers/simulations/SimulationActions.js create mode 100644 src/containers/simulations/VisibleSimulationAuthList.js (limited to 'src/containers') diff --git a/src/containers/projects/FilterLink.js b/src/containers/projects/FilterLink.js deleted file mode 100644 index e9a13436..00000000 --- a/src/containers/projects/FilterLink.js +++ /dev/null @@ -1,22 +0,0 @@ -import {connect} from "react-redux"; -import {setAuthVisibilityFilter} from "../../actions/projects"; -import FilterButton from "../../components/projects/FilterButton"; - -const mapStateToProps = (state, ownProps) => { - return { - active: state.authVisibilityFilter === ownProps.filter - }; -}; - -const mapDispatchToProps = (dispatch, ownProps) => { - return { - onClick: () => dispatch(setAuthVisibilityFilter(ownProps.filter)) - }; -}; - -const FilterLink = connect( - mapStateToProps, - mapDispatchToProps -)(FilterButton); - -export default FilterLink; diff --git a/src/containers/projects/NewProjectModal.js b/src/containers/projects/NewProjectModal.js deleted file mode 100644 index affaf794..00000000 --- a/src/containers/projects/NewProjectModal.js +++ /dev/null @@ -1,34 +0,0 @@ -import React from "react"; -import {connect} from "react-redux"; -import {addProject, closeNewProjectModal} from "../../actions/projects"; -import TextInputModal from "../../components/modals/TextInputModal"; - -const NewProjectModalComponent = ({visible, callback}) => ( - -); - -const mapStateToProps = state => { - return { - visible: state.newProjectModalVisible - }; -}; - -const mapDispatchToProps = dispatch => { - return { - callback: (text) => { - if (text) { - dispatch(addProject(text)); - } - dispatch(closeNewProjectModal()); - } - }; -}; - -const NewProjectModal = connect( - mapStateToProps, - mapDispatchToProps -)(NewProjectModalComponent); - -export default NewProjectModal; diff --git a/src/containers/projects/ProjectActions.js b/src/containers/projects/ProjectActions.js deleted file mode 100644 index 098d9966..00000000 --- a/src/containers/projects/ProjectActions.js +++ /dev/null @@ -1,24 +0,0 @@ -import {connect} from "react-redux"; -import {deleteProject, openProject} from "../../actions/projects"; -import ProjectActionButtons from "../../components/projects/ProjectActionButtons"; - -const mapStateToProps = (state, ownProps) => { - return { - projectId: ownProps.projectId - }; -}; - -const mapDispatchToProps = dispatch => { - return { - onOpen: (id) => dispatch(openProject(id)), - onViewUsers: (id) => {}, - onDelete: (id) => dispatch(deleteProject(id)), - }; -}; - -const ProjectActions = connect( - mapStateToProps, - mapDispatchToProps -)(ProjectActionButtons); - -export default ProjectActions; diff --git a/src/containers/projects/VisibleProjectAuthList.js b/src/containers/projects/VisibleProjectAuthList.js deleted file mode 100644 index f668711e..00000000 --- a/src/containers/projects/VisibleProjectAuthList.js +++ /dev/null @@ -1,32 +0,0 @@ -import {connect} from "react-redux"; -import ProjectList from "../../components/projects/ProjectAuthList"; - -const getVisibleProjectAuths = (projectAuths, filter) => { - switch (filter) { - case 'SHOW_ALL': - return projectAuths; - case 'SHOW_OWN': - return projectAuths.filter(projectAuth => projectAuth.authorizationLevel === "OWN"); - case 'SHOW_SHARED': - return projectAuths.filter(projectAuth => projectAuth.authorizationLevel !== "OWN"); - default: - return projectAuths; - } -}; - -const mapStateToProps = state => { - const denormalizedAuthorizations = state.authorizationsOfCurrentUser.map(authorizationIds => { - const authorization = Object.assign({}, state.objects.authorizations[authorizationIds]); - authorization.simulation = state.objects.simulations[authorization.simulationId]; - authorization.user = state.objects.users[authorization.userId]; - return authorization; - }); - - return { - authorizations: getVisibleProjectAuths(denormalizedAuthorizations, state.authVisibilityFilter) - }; -}; - -const VisibleProjectAuthList = connect(mapStateToProps)(ProjectList); - -export default VisibleProjectAuthList; diff --git a/src/containers/simulations/FilterLink.js b/src/containers/simulations/FilterLink.js new file mode 100644 index 00000000..dff01ab2 --- /dev/null +++ b/src/containers/simulations/FilterLink.js @@ -0,0 +1,22 @@ +import {connect} from "react-redux"; +import {setAuthVisibilityFilter} from "../../actions/simulations"; +import FilterButton from "../../components/simulations/FilterButton"; + +const mapStateToProps = (state, ownProps) => { + return { + active: state.authVisibilityFilter === ownProps.filter + }; +}; + +const mapDispatchToProps = (dispatch, ownProps) => { + return { + onClick: () => dispatch(setAuthVisibilityFilter(ownProps.filter)) + }; +}; + +const FilterLink = connect( + mapStateToProps, + mapDispatchToProps +)(FilterButton); + +export default FilterLink; diff --git a/src/containers/simulations/NewSimulationModal.js b/src/containers/simulations/NewSimulationModal.js new file mode 100644 index 00000000..a4a3d2a8 --- /dev/null +++ b/src/containers/simulations/NewSimulationModal.js @@ -0,0 +1,34 @@ +import React from "react"; +import {connect} from "react-redux"; +import {addSimulation, closeNewSimulationModal} from "../../actions/simulations"; +import TextInputModal from "../../components/modals/TextInputModal"; + +const NewSimulationModalComponent = ({visible, callback}) => ( + +); + +const mapStateToProps = state => { + return { + visible: state.newSimulationModalVisible + }; +}; + +const mapDispatchToProps = dispatch => { + return { + callback: (text) => { + if (text) { + dispatch(addSimulation(text)); + } + dispatch(closeNewSimulationModal()); + } + }; +}; + +const NewSimulationModal = connect( + mapStateToProps, + mapDispatchToProps +)(NewSimulationModalComponent); + +export default NewSimulationModal; diff --git a/src/containers/simulations/SimulationActions.js b/src/containers/simulations/SimulationActions.js new file mode 100644 index 00000000..e2ca2795 --- /dev/null +++ b/src/containers/simulations/SimulationActions.js @@ -0,0 +1,24 @@ +import {connect} from "react-redux"; +import {deleteSimulation, openSimulation} from "../../actions/simulations"; +import SimulationActionButtons from "../../components/simulations/SimulationActionButtons"; + +const mapStateToProps = (state, ownProps) => { + return { + simulationId: ownProps.simulationId + }; +}; + +const mapDispatchToProps = dispatch => { + return { + onOpen: (id) => dispatch(openSimulation(id)), + onViewUsers: (id) => {}, + onDelete: (id) => dispatch(deleteSimulation(id)), + }; +}; + +const SimulationActions = connect( + mapStateToProps, + mapDispatchToProps +)(SimulationActionButtons); + +export default SimulationActions; diff --git a/src/containers/simulations/VisibleSimulationAuthList.js b/src/containers/simulations/VisibleSimulationAuthList.js new file mode 100644 index 00000000..07740435 --- /dev/null +++ b/src/containers/simulations/VisibleSimulationAuthList.js @@ -0,0 +1,32 @@ +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.authorizationsOfCurrentUser.map(authorizationIds => { + const authorization = Object.assign({}, state.objects.authorizations[authorizationIds]); + authorization.simulation = state.objects.simulations[authorization.simulationId]; + authorization.user = state.objects.users[authorization.userId]; + return authorization; + }); + + return { + authorizations: getVisibleSimulationAuths(denormalizedAuthorizations, state.authVisibilityFilter) + }; +}; + +const VisibleSimulationAuthList = connect(mapStateToProps)(SimulationList); + +export default VisibleSimulationAuthList; -- cgit v1.2.3