From 2df87854c4fc49ff58ad1ffd074cae79b7e086d3 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 2 Mar 2016 22:19:04 -0800
Subject: [PATCH] Fix unknown hike redirect to map

---
 client/sagas/hard-go-to-saga.js               | 24 +++++++++++++++++++
 client/sagas/index.js                         |  3 ++-
 common/app/redux/actions.js                   |  3 +++
 common/app/redux/types.js                     |  4 +++-
 common/app/routes/Hikes/components/Hikes.jsx  |  1 -
 .../app/routes/Hikes/components/Lecture.jsx   | 19 +++++++++++----
 6 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 client/sagas/hard-go-to-saga.js

diff --git a/client/sagas/hard-go-to-saga.js b/client/sagas/hard-go-to-saga.js
new file mode 100644
index 0000000000..2fa37cc6fc
--- /dev/null
+++ b/client/sagas/hard-go-to-saga.js
@@ -0,0 +1,24 @@
+import { hardGoTo } from '../../common/app/redux/types';
+
+const loc = typeof window !== 'undefined' ?
+  window.location :
+  {};
+
+export default () => ({ dispatch }) => next => {
+  return function hardGoToSaga(action) {
+    const result = next(action);
+    if (action.type !== hardGoTo) {
+      return result;
+    }
+
+    if (!loc.pathname) {
+      dispatch({
+        type: 'app.error',
+        error: new Error('no location object found')
+      });
+    }
+
+    loc.pathname = action.payload || '/map';
+    return null;
+  };
+};
diff --git a/client/sagas/index.js b/client/sagas/index.js
index cb4e09a185..3a7fee2345 100644
--- a/client/sagas/index.js
+++ b/client/sagas/index.js
@@ -1,5 +1,6 @@
 import errSaga from './err-saga';
 import titleSaga from './title-saga';
 import localStorageSaga from './local-storage-saga';
+import hardGoToSaga from './hard-go-to-saga';
 
-export default [errSaga, titleSaga, localStorageSaga];
+export default [ errSaga, titleSaga, localStorageSaga, hardGoToSaga ];
diff --git a/common/app/redux/actions.js b/common/app/redux/actions.js
index 8bdfeeda6a..f04893fdcc 100644
--- a/common/app/redux/actions.js
+++ b/common/app/redux/actions.js
@@ -27,3 +27,6 @@ export const setUser = createAction(types.setUser);
 
 // updatePoints(points: Number) => Action
 export const updatePoints = createAction(types.updatePoints);
+
+// hardGoTo(path: String) => Action
+export const hardGoTo = createAction(types.hardGoTo);
diff --git a/common/app/redux/types.js b/common/app/redux/types.js
index 16122457f5..0292822024 100644
--- a/common/app/redux/types.js
+++ b/common/app/redux/types.js
@@ -6,7 +6,9 @@ const types = [
 
   'makeToast',
   'updatePoints',
-  'handleError'
+  'handleError',
+  // used to hit the server
+  'hardGoTo'
 ];
 
 export default types
diff --git a/common/app/routes/Hikes/components/Hikes.jsx b/common/app/routes/Hikes/components/Hikes.jsx
index f1595d61e0..da41f8e4ca 100644
--- a/common/app/routes/Hikes/components/Hikes.jsx
+++ b/common/app/routes/Hikes/components/Hikes.jsx
@@ -29,7 +29,6 @@ const mapStateToProps = createSelector(
 
 const fetchOptions = {
   fetchAction: 'fetchHikes',
-
   isPrimed: ({ hikes }) => hikes && !!hikes.length,
   getActionArgs: ({ params: { dashedName } }) => [ dashedName ],
   shouldContainerFetch(props, nextProps) {
diff --git a/common/app/routes/Hikes/components/Lecture.jsx b/common/app/routes/Hikes/components/Lecture.jsx
index 2598766d69..8e8a40a698 100644
--- a/common/app/routes/Hikes/components/Lecture.jsx
+++ b/common/app/routes/Hikes/components/Lecture.jsx
@@ -5,6 +5,7 @@ import Vimeo from 'react-vimeo';
 import { createSelector } from 'reselect';
 import debug from 'debug';
 
+import { hardGoTo } from '../../../redux/actions';
 import { toggleQuestionView } from '../redux/actions';
 import { getCurrentHike } from '../redux/selectors';
 
@@ -33,11 +34,18 @@ export class Lecture extends React.Component {
     // actions
     toggleQuestionView: PropTypes.func,
     // ui
-    id: PropTypes.string,
+    id: PropTypes.number,
     description: PropTypes.array,
-    dashedName: PropTypes.string
+    dashedName: PropTypes.string,
+    hardGoTo: PropTypes.func
   };
 
+  componentWillMount() {
+    if (!this.props.id) {
+      this.props.hardGoTo('/map');
+    }
+  }
+
   shouldComponentUpdate(nextProps) {
     const { props } = this;
     return nextProps.id !== props.id;
@@ -70,7 +78,7 @@ export class Lecture extends React.Component {
           <Vimeo
             onError={ this.handleError }
             onFinish= { toggleQuestionView }
-            videoId={ id } />
+            videoId={ '' + id } />
         </Row>
         <Row>
           <article>
@@ -89,4 +97,7 @@ export class Lecture extends React.Component {
   }
 }
 
-export default connect(mapStateToProps, { toggleQuestionView })(Lecture);
+export default connect(
+  mapStateToProps,
+  { hardGoTo, toggleQuestionView }
+)(Lecture);