From 751a9ef3a12c952fe179f256d854d0c4aa37e28e Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 4 Oct 2017 22:49:07 +0200 Subject: Apply prettier to codebase --- .../simulation/ExperimentMetadataContainer.js | 49 +++++++++++++--------- .../app/sidebars/simulation/LoadMetricContainer.js | 12 +++--- .../app/sidebars/simulation/TaskContainer.js | 31 +++++++------- .../app/sidebars/simulation/TraceContainer.js | 29 +++++++------ 4 files changed, 67 insertions(+), 54 deletions(-) (limited to 'src/containers/app/sidebars/simulation') diff --git a/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js b/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js index a5e403ce..25a0d9e9 100644 --- a/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js +++ b/src/containers/app/sidebars/simulation/ExperimentMetadataContainer.js @@ -1,29 +1,38 @@ -import {connect} from "react-redux"; +import { connect } from "react-redux"; import ExperimentMetadataComponent from "../../../../components/app/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; - + if (!state.objects.experiment[state.currentExperimentId]) { 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, + 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); +const ExperimentMetadataContainer = connect(mapStateToProps)( + ExperimentMetadataComponent +); export default ExperimentMetadataContainer; diff --git a/src/containers/app/sidebars/simulation/LoadMetricContainer.js b/src/containers/app/sidebars/simulation/LoadMetricContainer.js index 5ce3542c..0c66b582 100644 --- a/src/containers/app/sidebars/simulation/LoadMetricContainer.js +++ b/src/containers/app/sidebars/simulation/LoadMetricContainer.js @@ -1,14 +1,12 @@ -import {connect} from "react-redux"; +import { connect } from "react-redux"; import LoadMetricComponent from "../../../../components/app/sidebars/simulation/LoadMetricComponent"; const mapStateToProps = state => { - return { - loadMetric: state.loadMetric, - } + return { + loadMetric: state.loadMetric + }; }; -const LoadMetricContainer = connect( - mapStateToProps -)(LoadMetricComponent); +const LoadMetricContainer = connect(mapStateToProps)(LoadMetricComponent); export default LoadMetricContainer; diff --git a/src/containers/app/sidebars/simulation/TaskContainer.js b/src/containers/app/sidebars/simulation/TaskContainer.js index 357bd7ed..093d4266 100644 --- a/src/containers/app/sidebars/simulation/TaskContainer.js +++ b/src/containers/app/sidebars/simulation/TaskContainer.js @@ -1,23 +1,26 @@ -import {connect} from "react-redux"; +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; + 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; - } + 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, - }; + return { + task: state.objects.task[ownProps.taskId], + flopsLeft + }; }; -const TaskContainer = connect( - mapStateToProps -)(TaskComponent); +const TaskContainer = connect(mapStateToProps)(TaskComponent); export default TaskContainer; diff --git a/src/containers/app/sidebars/simulation/TraceContainer.js b/src/containers/app/sidebars/simulation/TraceContainer.js index 7955f313..682b6cc9 100644 --- a/src/containers/app/sidebars/simulation/TraceContainer.js +++ b/src/containers/app/sidebars/simulation/TraceContainer.js @@ -1,22 +1,25 @@ -import {connect} from "react-redux"; +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: [] - }; - } - + if ( + !state.objects.experiment[state.currentExperimentId] || + !state.objects.trace[ + state.objects.experiment[state.currentExperimentId].traceId + ].jobIds + ) { return { - jobs: state.objects.trace[state.objects.experiment[state.currentExperimentId].traceId].jobIds - .map(id => state.objects.job[id]), + jobs: [] }; + } + + return { + jobs: state.objects.trace[ + state.objects.experiment[state.currentExperimentId].traceId + ].jobIds.map(id => state.objects.job[id]) + }; }; -const TraceContainer = connect( - mapStateToProps -)(TraceComponent); +const TraceContainer = connect(mapStateToProps)(TraceComponent); export default TraceContainer; -- cgit v1.2.3