Addressed some of @foot's comments.

weaveworks · Jul 6, 2017 · 94da5e9 · 94da5e9
1 parent b7b4afa
commit 94da5e9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js
@@ -576,7 +576,7 @@ export function resumeTime() {
   };
 }
 
-export function clickTimeTravel() {
+export function startTimeTravel() {
   return (dispatch, getState) => {
     dispatch({
       type: ActionTypes.START_TIME_TRAVEL

diff --git a/client/app/scripts/components/time-control.js b/client/app/scripts/components/time-control.js
@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
 import CloudFeature from './cloud-feature';
 import TimeTravelButton from './time-travel-button';
 import { trackMixpanelEvent } from '../utils/tracking-utils';
-import { pauseTimeAtNow, resumeTime, clickTimeTravel } from '../actions/app-actions';
+import { pauseTimeAtNow, resumeTime, startTimeTravel } from '../actions/app-actions';
 
 
 const className = isSelected => (
@@ -23,12 +23,13 @@ class TimeControl extends React.Component {
     this.getTrackingMetadata = this.getTrackingMetadata.bind(this);
   }
 
-  getTrackingMetadata() {
+  getTrackingMetadata(data = {}) {
     const { currentTopology } = this.props;
     return {
       layout: this.props.topologyViewMode,
       topologyId: currentTopology && currentTopology.get('id'),
       parentTopologyId: currentTopology && currentTopology.get('parentId'),
+      ...data
     };
   }
 
@@ -43,8 +44,13 @@ class TimeControl extends React.Component {
   }
 
   handleTravelClick() {
-    trackMixpanelEvent('scope.time.travel.click', this.getTrackingMetadata());
-    this.props.clickTimeTravel();
+    if (!this.props.showingTimeTravel) {
+      trackMixpanelEvent('scope.time.travel.click', this.getTrackingMetadata({ open: true }));
+      this.props.startTimeTravel();
+    } else {
+      trackMixpanelEvent('scope.time.travel.click', this.getTrackingMetadata({ open: false }));
+      this.props.resumeTime();
+    }
   }
 
   render() {
@@ -117,6 +123,6 @@ export default connect(
   {
     resumeTime,
     pauseTimeAtNow,
-    clickTimeTravel,
+    startTimeTravel,
   }
 )(TimeControl);
diff --git a/client/app/scripts/reducers/root.js b/client/app/scripts/reducers/root.js
@@ -328,11 +328,6 @@ export function rootReducer(state = initialState, action) {
       return state;
     }
 
-    case ActionTypes.FINISH_TIME_TRAVEL_TRANSITION: {
-      state = state.set('timeTravelTransitioning', false);
-      return clearNodes(state);
-    }
-
     case ActionTypes.CLICK_SHOW_TOPOLOGY_FOR_NODE: {
       state = state.update('nodeDetails',
         nodeDetails => nodeDetails.filter((v, k) => k === action.nodeId));
@@ -375,6 +370,7 @@ export function rootReducer(state = initialState, action) {
     }
 
     case ActionTypes.START_TIME_TRAVEL: {
+      state = state.set('timeTravelTransitioning', false);
       state = state.set('showingTimeTravel', true);
       return state.set('pausedAt', moment().utc());
     }
@@ -387,6 +383,11 @@ export function rootReducer(state = initialState, action) {
       return state.set('timeTravelTransitioning', true);
     }
 
+    case ActionTypes.FINISH_TIME_TRAVEL_TRANSITION: {
+      state = state.set('timeTravelTransitioning', false);
+      return clearNodes(state);
+    }
+
     //
     // websockets
     //