Exit time travel mode as a part of the app shutdown().

weaveworks · Aug 10, 2017 · 0c78962 · 0c78962
1 parent f19e4c5
commit 0c78962
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js
@@ -798,10 +798,16 @@ export function changeInstance() {
 }
 
 export function shutdown() {
-  stopPolling();
-  teardownWebsockets();
-  return {
-    type: ActionTypes.SHUTDOWN
+  return (dispatch) => {
+    stopPolling();
+    teardownWebsockets();
+    // Exit the time travel mode before unmounting the app.
+    dispatch({
+      type: ActionTypes.RESUME_TIME
+    });
+    dispatch({
+      type: ActionTypes.SHUTDOWN
+    });
   };
 }
 

diff --git a/client/app/scripts/components/time-travel.js b/client/app/scripts/components/time-travel.js
@@ -47,11 +47,6 @@ class TimeTravel extends React.Component {
     this.setState(getTimestampStates(props.pausedAt));
   }
 
-  componentWillUnmount() {
-    // TODO: Get rid of this somehow. See: https://github.com/weaveworks/service-ui/issues/814
-    this.props.resumeTime();
-  }
-
   handleInputChange(ev) {
     const timestamp = moment(ev.target.value);
     this.setState({ inputValue: ev.target.value });