Merge pull request #261 from opentripplanner/dev

Bug fix/feature release

__tests__/reducers/__snapshots__/create-otp-reducer.js.snap

@@ -50,7 +50,7 @@ Object {
     "filter": "ALL",
     "sort": Object {
       "direction": "ASC",
-      "type": "BEST",
+      "type": null,
     },
   },
   "location": Object {

lib/actions/user.js

@@ -1,5 +1,6 @@
 import { createAction } from 'redux-actions'
 
+import { routeTo } from './ui'
 import {
   addTrip,
   addUser,
@@ -40,7 +41,7 @@ export function fetchUserMonitoredTrips (accessToken) {
     if (otpMiddleware) {
       const { data: trips, status: fetchStatus } = await getTrips(otpMiddleware, accessToken)
       if (fetchStatus === 'success') {
-        dispatch(setCurrentUserMonitoredTrips(trips))
+        dispatch(setCurrentUserMonitoredTrips(trips.data))
       }
     }
   }
@@ -154,6 +155,9 @@ export function createOrUpdateUserMonitoredTrip (tripData, isNew, silentOnSucces
 
         // Reload user's monitored trips after add/update.
         await dispatch(fetchUserMonitoredTrips(accessToken))
+
+        // Finally, navigate to the saved trips page.
+        dispatch(routeTo('/savedtrips'))
       } else {
         alert(`An error was encountered:\n${JSON.stringify(result)}`)
       }

lib/components/form/error-message.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import TripTools from '../narrative/trip-tools'
 
-import { getActiveSearch } from '../../util/state'
+import { getActiveErrors } from '../../util/state'
 
 class ErrorMessage extends Component {
   static propTypes = {
@@ -45,9 +45,8 @@ class ErrorMessage extends Component {
 // connect to the redux store
 
 const mapStateToProps = (state, ownProps) => {
-  const activeSearch = getActiveSearch(state.otp)
   return {
-    error: activeSearch && activeSearch.response && activeSearch.response.error,
+    error: getActiveErrors(state.otp)[0],
     currentQuery: state.otp.currentQuery,
     errorMessages: state.otp.config.errorMessages
   }

lib/components/mobile/results-screen.js

@@ -16,7 +16,12 @@ import MobileNavigationBar from './navigation-bar'
 import { MobileScreens, setMobileScreen } from '../../actions/ui'
 import { setUseRealtimeResponse } from '../../actions/narrative'
 import { clearActiveSearch } from '../../actions/form'
-import { getActiveItineraries, getActiveSearch, getRealtimeEffects } from '../../util/state'
+import {
+  getActiveErrors,
+  getActiveItineraries,
+  getActiveSearch,
+  getRealtimeEffects
+} from '../../util/state'
 
 const LocationContainer = styled.div`
   font-weight: 300;
@@ -239,7 +244,7 @@ const mapStateToProps = (state, ownProps) => {
   return {
     query: state.otp.currentQuery,
     realtimeEffects,
-    error: response && response.error,
+    error: getActiveErrors(state.otp)[0],
     resultCount:
       response
         ? activeSearch.query.routingType === 'ITINERARY'

lib/components/narrative/narrative-routing-results.js

@@ -6,7 +6,11 @@ import Loading from './loading'
 import TabbedItineraries from './tabbed-itineraries'
 import ErrorMessage from '../form/error-message'
 
-import { getActiveSearch, getActiveItineraries } from '../../util/state'
+import {
+  getActiveErrors,
+  getActiveItineraries,
+  getActiveSearch
+} from '../../util/state'
 import { setMainPanelContent } from '../../actions/ui'
 
 class NarrativeRoutingResults extends Component {
@@ -47,7 +51,7 @@ const mapStateToProps = (state, ownProps) => {
   const pending = activeSearch ? Boolean(activeSearch.pending) : false
   return {
     mainPanelContent: state.otp.ui.mainPanelContent,
-    error: activeSearch && activeSearch.response && activeSearch.response.error,
+    error: getActiveErrors(state.otp)[0],
     itineraries: getActiveItineraries(state.otp),
     pending,
     routingType: activeSearch && activeSearch.query.routingType

lib/components/user/existing-account-display.js

@@ -1,43 +1,46 @@
-import React, { Component } from 'react'
+import React from 'react'
 
 import LinkButton from './link-button'
 import StackedPaneDisplay from './stacked-pane-display'
 
 /**
  * This component handles the existing account display.
  */
-class ExistingAccountDisplay extends Component {
-  render () {
-    const { onCancel, onComplete, panes } = this.props
-    const paneSequence = [
-      {
-        pane: () => <p><LinkButton to='/savedtrips'>Edit my trips</LinkButton></p>,
-        title: 'My trips'
-      },
-      {
-        pane: panes.terms,
-        props: { disableCheckTerms: true },
-        title: 'Terms'
-      },
-      {
-        pane: panes.notifications,
-        title: 'Notifications'
-      },
-      {
-        pane: panes.locations,
-        title: 'My locations'
-      }
-    ]
+const ExistingAccountDisplay = props => {
+  // The props include Formik props that provide access to the current user data
+  // and to its own blur/change/submit event handlers that automate the state.
+  // We forward the props to each pane so that their individual controls
+  // can be wired to be managed by Formik.
+  const { onCancel, panes } = props
+  const paneSequence = [
+    {
+      pane: () => <p><LinkButton to='/savedtrips'>Edit my trips</LinkButton></p>,
+      title: 'My trips'
+    },
+    {
+      pane: panes.terms,
+      props: { ...props, disableCheckTerms: true },
+      title: 'Terms'
+    },
+    {
+      pane: panes.notifications,
+      props,
+      title: 'Notifications'
+    },
+    {
+      pane: panes.locations,
+      props,
+      title: 'My locations'
+    }
+  ]
 
-    return (
-      <StackedPaneDisplay
-        onCancel={onCancel}
-        onComplete={onComplete}
-        paneSequence={paneSequence}
-        title='My Account'
-      />
-    )
-  }
+  return (
+    <StackedPaneDisplay
+      onCancel={onCancel}
+      paneSequence={paneSequence}
+      title='My Account'
+    />
+  )
 }
 
 export default ExistingAccountDisplay