5 files changed, 114 insertions, 1 deletions
diff --git a/src/containers/sidebars/simulation/ExperimentMetadataContainer.js b/src/containers/sidebars/simulation/ExperimentMetadataContainer.js
new file mode 100644
index 00000000..55323f11
--- /dev/null
+++ b/src/containers/sidebars/simulation/ExperimentMetadataContainer.js
@@ -0,0 +1,29 @@
+import {connect} from "react-redux";
+import ExperimentMetadataComponent from "../../../components/sidebars/simulation/ExperimentMetadataComponent";
+
+const mapStateToProps = state => {
+    if (!state.objects.experiment[state.currentExperimentId]) {
+        return {
+            experimentName: "Loading experiment",
+            pathName: "",
+            traceName: "",
+            schedulerName: "",
+        }
+    }
+
+    const path = state.objects.path[state.objects.experiment[state.currentExperimentId].pathId];
+    const pathName = path.name ? path.name : "Path " + path.id;
+
+    return {
+        experimentName: state.objects.experiment[state.currentExperimentId].name,
+        pathName,
+        traceName: state.objects.trace[state.objects.experiment[state.currentExperimentId].traceId].name,
+        schedulerName: state.objects.scheduler[state.objects.experiment[state.currentExperimentId].schedulerName].name,
+    };
+};
+
+const ExperimentMetadataContainer = connect(
+    mapStateToProps
+)(ExperimentMetadataComponent);
+
+export default ExperimentMetadataContainer;
diff --git a/src/containers/sidebars/simulation/TaskContainer.js b/src/containers/sidebars/simulation/TaskContainer.js
new file mode 100644
index 00000000..df06b5b8
--- /dev/null
+++ b/src/containers/sidebars/simulation/TaskContainer.js
@@ -0,0 +1,23 @@
+import {connect} from "react-redux";
+import TaskComponent from "../../../components/sidebars/simulation/TaskComponent";
+
+const mapStateToProps = (state, ownProps) => {
+    let flopsLeft = state.objects.task[ownProps.taskId].totalFlopCount;
+
+    if (state.states.task[state.currentTick] && state.states.task[state.currentTick][ownProps.taskId]) {
+        flopsLeft = state.states.task[state.currentTick][ownProps.taskId].flopsLeft;
+    } else if (state.objects.task[ownProps.taskId].startTick < state.currentTick) {
+        flopsLeft = 0;
+    }
+
+    return {
+        task: state.objects.task[ownProps.taskId],
+        flopsLeft,
+    };
+};
+
+const TaskContainer = connect(
+    mapStateToProps
+)(TaskComponent);
+
+export default TaskContainer;
diff --git a/src/containers/sidebars/simulation/TraceContainer.js b/src/containers/sidebars/simulation/TraceContainer.js
new file mode 100644
index 00000000..6539823d
--- /dev/null
+++ b/src/containers/sidebars/simulation/TraceContainer.js
@@ -0,0 +1,22 @@
+import {connect} from "react-redux";
+import TraceComponent from "../../../components/sidebars/simulation/TraceComponent";
+
+const mapStateToProps = state => {
+    if (!state.objects.experiment[state.currentExperimentId] ||
+        !state.objects.trace[state.objects.experiment[state.currentExperimentId].traceId].jobIds) {
+        return {
+            jobs: []
+        };
+    }
+
+    return {
+        jobs: state.objects.trace[state.objects.experiment[state.currentExperimentId].traceId].jobIds
+            .map(id => state.objects.job[id]),
+    };
+};
+
+const TraceContainer = connect(
+    mapStateToProps
+)(TraceComponent);
+
+export default TraceContainer;
diff --git a/src/containers/timeline/TimelineContainer.js b/src/containers/timeline/TimelineContainer.js
new file mode 100644
index 00000000..32756b6d
--- /dev/null
+++ b/src/containers/timeline/TimelineContainer.js
@@ -0,0 +1,37 @@
+import {connect} from "react-redux";
+import {incrementTick} from "../../actions/simulation/tick";
+import {setCurrentDatacenter} from "../../actions/topology/building";
+import TimelineComponent from "../../components/timeline/TimelineComponent";
+
+const mapStateToProps = state => {
+    let sections = [];
+    if (state.currentExperimentId !== -1) {
+        const sectionIds = state.objects.path[state.objects.experiment[state.currentExperimentId].pathId].sectionIds;
+
+        if (sectionIds) {
+            sections = sectionIds.map(sectionId => state.objects.section[sectionId]);
+        }
+    }
+
+    return {
+        isPlaying: state.isPlaying,
+        currentTick: state.currentTick,
+        lastSimulatedTick: state.lastSimulatedTick,
+        currentDatacenterId: state.currentDatacenterId,
+        sections,
+    };
+};
+
+const mapDispatchToProps = dispatch => {
+    return {
+        incrementTick: () => dispatch(incrementTick()),
+        setCurrentDatacenter: id => dispatch(setCurrentDatacenter(id))
+    };
+};
+
+const TimelineContainer = connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(TimelineComponent);
+
+export default TimelineContainer;
diff --git a/src/containers/timeline/TimelineControlsContainer.js b/src/containers/timeline/TimelineControlsContainer.js
index e5c89060..1afd336a 100644
--- a/src/containers/timeline/TimelineControlsContainer.js
+++ b/src/containers/timeline/TimelineControlsContainer.js
@@ -5,7 +5,9 @@ const mapStateToProps = state => {
     let sectionTicks = [];
     if (state.currentExperimentId !== -1) {
         const sectionIds = state.objects.path[state.objects.experiment[state.currentExperimentId].pathId].sectionIds;
-        sectionTicks = sectionIds.map(sectionId => state.objects.section[sectionId].startTick);
+        if (sectionIds) {
+            sectionTicks = sectionIds.map(sectionId => state.objects.section[sectionId].startTick);
+        }
     }
 
     return {