From f119fc78dda4d1e828dde04f378a63a93e3a0a7e Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 2 Jul 2020 18:39:28 +0200 Subject: Add current progress on frontend port --- .../src/containers/app/timeline/PlayButtonContainer.js | 5 +---- .../src/containers/app/timeline/TimelineContainer.js | 17 +---------------- .../app/timeline/TimelineControlsContainer.js | 14 -------------- 3 files changed, 2 insertions(+), 34 deletions(-) (limited to 'frontend/src/containers/app/timeline') diff --git a/frontend/src/containers/app/timeline/PlayButtonContainer.js b/frontend/src/containers/app/timeline/PlayButtonContainer.js index e332f08b..9662d753 100644 --- a/frontend/src/containers/app/timeline/PlayButtonContainer.js +++ b/frontend/src/containers/app/timeline/PlayButtonContainer.js @@ -1,8 +1,5 @@ import { connect } from 'react-redux' -import { - pauseSimulation, - playSimulation, -} from '../../../actions/simulation/playback' +import { pauseSimulation, playSimulation } from '../../../actions/simulation/playback' import PlayButtonComponent from '../../../components/app/timeline/PlayButtonComponent' const mapStateToProps = state => { diff --git a/frontend/src/containers/app/timeline/TimelineContainer.js b/frontend/src/containers/app/timeline/TimelineContainer.js index 4fcaaaaf..9b196a1b 100644 --- a/frontend/src/containers/app/timeline/TimelineContainer.js +++ b/frontend/src/containers/app/timeline/TimelineContainer.js @@ -1,28 +1,14 @@ import { connect } from 'react-redux' import { pauseSimulation } from '../../../actions/simulation/playback' import { incrementTick } from '../../../actions/simulation/tick' -import { setCurrentDatacenter } from '../../../actions/topology/building' import TimelineComponent from '../../../components/app/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, + currentTopologyId: state.currentTopologyId, } } @@ -30,7 +16,6 @@ const mapDispatchToProps = dispatch => { return { incrementTick: () => dispatch(incrementTick()), pauseSimulation: () => dispatch(pauseSimulation()), - setCurrentDatacenter: id => dispatch(setCurrentDatacenter(id)), } } diff --git a/frontend/src/containers/app/timeline/TimelineControlsContainer.js b/frontend/src/containers/app/timeline/TimelineControlsContainer.js index 92e03e6a..91aba98d 100644 --- a/frontend/src/containers/app/timeline/TimelineControlsContainer.js +++ b/frontend/src/containers/app/timeline/TimelineControlsContainer.js @@ -3,23 +3,9 @@ import { goToTick } from '../../../actions/simulation/tick' import TimelineControlsComponent from '../../../components/app/timeline/TimelineControlsComponent' const mapStateToProps = state => { - let sectionTicks = [] - if (state.currentExperimentId !== -1) { - const sectionIds = - state.objects.path[ - state.objects.experiment[state.currentExperimentId].pathId - ].sectionIds - if (sectionIds) { - sectionTicks = sectionIds - .filter(sectionId => state.objects.section[sectionId].startTick !== 0) - .map(sectionId => state.objects.section[sectionId].startTick) - } - } - return { currentTick: state.currentTick, lastSimulatedTick: state.lastSimulatedTick, - sectionTicks, } } -- cgit v1.2.3