summaryrefslogtreecommitdiff
path: root/frontend/src/containers/app/sidebars/simulation
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src/containers/app/sidebars/simulation')
-rw-r--r--frontend/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js12
-rw-r--r--frontend/src/containers/app/sidebars/simulation/TaskContainer.js26
-rw-r--r--frontend/src/containers/app/sidebars/simulation/TraceContainer.js25
3 files changed, 6 insertions, 57 deletions
diff --git a/frontend/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js b/frontend/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js
index 06d0b88a..0dc20ea7 100644
--- a/frontend/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js
+++ b/frontend/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js
@@ -5,21 +5,21 @@ const mapStateToProps = state => {
if (!state.objects.experiment[state.currentExperimentId]) {
return {
experimentName: 'Loading experiment',
- pathName: '',
+ topologyName: '',
traceName: '',
schedulerName: '',
}
}
- const path =
- state.objects.path[
- state.objects.experiment[state.currentExperimentId].pathId
+ const topology =
+ state.objects.topology[
+ state.objects.experiment[state.currentExperimentId].topologyId
]
- const pathName = path.name ? path.name : 'Path ' + path.id
+ const topologyName = topology.name
return {
experimentName: state.objects.experiment[state.currentExperimentId].name,
- pathName,
+ topologyName,
traceName:
state.objects.trace[
state.objects.experiment[state.currentExperimentId].traceId
diff --git a/frontend/src/containers/app/sidebars/simulation/TaskContainer.js b/frontend/src/containers/app/sidebars/simulation/TaskContainer.js
deleted file mode 100644
index c4c86284..00000000
--- a/frontend/src/containers/app/sidebars/simulation/TaskContainer.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { connect } from 'react-redux'
-import TaskComponent from '../../../../components/app/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/frontend/src/containers/app/sidebars/simulation/TraceContainer.js b/frontend/src/containers/app/sidebars/simulation/TraceContainer.js
deleted file mode 100644
index 907c8874..00000000
--- a/frontend/src/containers/app/sidebars/simulation/TraceContainer.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { connect } from 'react-redux'
-import TraceComponent from '../../../../components/app/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