From eb208a7e2fd020ab5d07d11cc6d52d1e3dcfcc7c Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Sun, 17 Sep 2017 17:55:04 +0200
Subject: Add simulation mode framework

Includes object states in the store (by tick), charting, and progress bars.
---
 .../topology/building/BuildingSidebarContainer.js  |  2 +-
 .../building/CancelNewRoomConstructionButton.js    | 16 -------------
 .../building/FinishNewRoomConstructionButton.js    | 16 -------------
 .../building/NewRoomConstructionContainer.js       | 28 ++++++++++++++++++++++
 .../building/StartNewRoomConstructionButton.js     | 16 -------------
 5 files changed, 29 insertions(+), 49 deletions(-)
 delete mode 100644 src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js
 delete mode 100644 src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js
 create mode 100644 src/containers/sidebars/topology/building/NewRoomConstructionContainer.js
 delete mode 100644 src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js

(limited to 'src/containers/sidebars/topology/building')

diff --git a/src/containers/sidebars/topology/building/BuildingSidebarContainer.js b/src/containers/sidebars/topology/building/BuildingSidebarContainer.js
index a91ad5ef..a3e09149 100644
--- a/src/containers/sidebars/topology/building/BuildingSidebarContainer.js
+++ b/src/containers/sidebars/topology/building/BuildingSidebarContainer.js
@@ -3,7 +3,7 @@ import BuildingSidebarComponent from "../../../../components/sidebars/topology/b
 
 const mapStateToProps = state => {
     return {
-        currentRoomInConstruction: state.construction.currentRoomInConstruction
+        inSimulation: state.construction.currentExperimentId !== -1
     };
 };
 
diff --git a/src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js b/src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js
deleted file mode 100644
index 399c7a0d..00000000
--- a/src/containers/sidebars/topology/building/CancelNewRoomConstructionButton.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import {connect} from "react-redux";
-import {cancelNewRoomConstruction} from "../../../../actions/topology/building";
-import CancelNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/CancelNewRoomConstructionComponent";
-
-const mapDispatchToProps = dispatch => {
-    return {
-        onClick: () => dispatch(cancelNewRoomConstruction()),
-    };
-};
-
-const CancelNewRoomConstructionButton = connect(
-    null,
-    mapDispatchToProps
-)(CancelNewRoomConstructionComponent);
-
-export default CancelNewRoomConstructionButton;
diff --git a/src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js b/src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js
deleted file mode 100644
index 8fc192e0..00000000
--- a/src/containers/sidebars/topology/building/FinishNewRoomConstructionButton.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import {connect} from "react-redux";
-import {finishNewRoomConstruction} from "../../../../actions/topology/building";
-import FinishNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/FinishNewRoomConstructionComponent";
-
-const mapDispatchToProps = dispatch => {
-    return {
-        onClick: () => dispatch(finishNewRoomConstruction()),
-    };
-};
-
-const FinishNewRoomConstructionButton = connect(
-    null,
-    mapDispatchToProps
-)(FinishNewRoomConstructionComponent);
-
-export default FinishNewRoomConstructionButton;
diff --git a/src/containers/sidebars/topology/building/NewRoomConstructionContainer.js b/src/containers/sidebars/topology/building/NewRoomConstructionContainer.js
new file mode 100644
index 00000000..0236522d
--- /dev/null
+++ b/src/containers/sidebars/topology/building/NewRoomConstructionContainer.js
@@ -0,0 +1,28 @@
+import {connect} from "react-redux";
+import {
+    cancelNewRoomConstruction,
+    finishNewRoomConstruction,
+    startNewRoomConstruction
+} from "../../../../actions/topology/building";
+import StartNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/NewRoomConstructionComponent";
+
+const mapStateToProps = state => {
+    return {
+        currentRoomInConstruction: state.construction.currentRoomInConstruction
+    };
+};
+
+const mapDispatchToProps = dispatch => {
+    return {
+        onStart: () => dispatch(startNewRoomConstruction()),
+        onFinish: () => dispatch(finishNewRoomConstruction()),
+        onCancel: () => dispatch(cancelNewRoomConstruction()),
+    };
+};
+
+const NewRoomConstructionButton = connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(StartNewRoomConstructionComponent);
+
+export default NewRoomConstructionButton;
diff --git a/src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js b/src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js
deleted file mode 100644
index c2c9808a..00000000
--- a/src/containers/sidebars/topology/building/StartNewRoomConstructionButton.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import {connect} from "react-redux";
-import {startNewRoomConstruction} from "../../../../actions/topology/building";
-import StartNewRoomConstructionComponent from "../../../../components/sidebars/topology/building/StartNewRoomConstructionComponent";
-
-const mapDispatchToProps = dispatch => {
-    return {
-        onClick: () => dispatch(startNewRoomConstruction()),
-    };
-};
-
-const StartNewRoomConstructionButton = connect(
-    null,
-    mapDispatchToProps
-)(StartNewRoomConstructionComponent);
-
-export default StartNewRoomConstructionButton;
-- 
cgit v1.2.3