summaryrefslogtreecommitdiff
path: root/src/containers
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-08-16 22:55:16 +0300
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-23 10:05:42 +0200
commit07195f3762b6a8a7dfb44c2231db58c5be13c43f (patch)
tree2b4640457f70b55a97aff22fbe617e4b8538464a /src/containers
parent91c8088e1d7def9242f60c708cd34f25dcb77d76 (diff)
Rename project to sim and enable sim-adding
Diffstat (limited to 'src/containers')
-rw-r--r--src/containers/projects/ProjectActions.js24
-rw-r--r--src/containers/projects/VisibleProjectAuthList.js32
-rw-r--r--src/containers/simulations/FilterLink.js (renamed from src/containers/projects/FilterLink.js)4
-rw-r--r--src/containers/simulations/NewSimulationModal.js (renamed from src/containers/projects/NewProjectModal.js)18
-rw-r--r--src/containers/simulations/SimulationActions.js24
-rw-r--r--src/containers/simulations/VisibleSimulationAuthList.js32
6 files changed, 67 insertions, 67 deletions
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/projects/FilterLink.js b/src/containers/simulations/FilterLink.js
index e9a13436..dff01ab2 100644
--- a/src/containers/projects/FilterLink.js
+++ b/src/containers/simulations/FilterLink.js
@@ -1,6 +1,6 @@
import {connect} from "react-redux";
-import {setAuthVisibilityFilter} from "../../actions/projects";
-import FilterButton from "../../components/projects/FilterButton";
+import {setAuthVisibilityFilter} from "../../actions/simulations";
+import FilterButton from "../../components/simulations/FilterButton";
const mapStateToProps = (state, ownProps) => {
return {
diff --git a/src/containers/projects/NewProjectModal.js b/src/containers/simulations/NewSimulationModal.js
index affaf794..a4a3d2a8 100644
--- a/src/containers/projects/NewProjectModal.js
+++ b/src/containers/simulations/NewSimulationModal.js
@@ -1,17 +1,17 @@
import React from "react";
import {connect} from "react-redux";
-import {addProject, closeNewProjectModal} from "../../actions/projects";
+import {addSimulation, closeNewSimulationModal} from "../../actions/simulations";
import TextInputModal from "../../components/modals/TextInputModal";
-const NewProjectModalComponent = ({visible, callback}) => (
- <TextInputModal title="New Project" label="Project title"
+const NewSimulationModalComponent = ({visible, callback}) => (
+ <TextInputModal title="New Simulation" label="Simulation title"
show={visible}
callback={callback}/>
);
const mapStateToProps = state => {
return {
- visible: state.newProjectModalVisible
+ visible: state.newSimulationModalVisible
};
};
@@ -19,16 +19,16 @@ const mapDispatchToProps = dispatch => {
return {
callback: (text) => {
if (text) {
- dispatch(addProject(text));
+ dispatch(addSimulation(text));
}
- dispatch(closeNewProjectModal());
+ dispatch(closeNewSimulationModal());
}
};
};
-const NewProjectModal = connect(
+const NewSimulationModal = connect(
mapStateToProps,
mapDispatchToProps
-)(NewProjectModalComponent);
+)(NewSimulationModalComponent);
-export default NewProjectModal;
+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;