Pass user's mobilityProfile to plan queries

lib/actions/apiV2.js

@@ -924,6 +924,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
   return function (dispatch, getState) {
     const state = getState()
     const { config, currentQuery, modeSettingDefinitions } = state.otp
+    const { loggedInUser } = state.user
     const persistenceMode = getPersistenceMode(config.persistence)
     const activeItinerary =
       getActiveItinerary(state) ||
@@ -998,6 +999,7 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
       },
       date,
       from: currentQuery.from,
+      mobilityProfile: loggedInUser?.mobilityProfile?.mobilityMode,
       modes: modes || activeModes,
       modeSettings,
       time,

lib/actions/user.js

@@ -245,7 +245,8 @@ function setUser(user, fetchTrips) {
   return function (dispatch, getState) {
     positionHomeAndWorkFirst(user)
     // If mobility profile is enabled, set a default selection for "no mobility devices".
-    if (getState().otp.config.mobilityProfile) {
+    const hasMobilityProfile = !!getState().otp.config.mobilityProfile
+    if (hasMobilityProfile) {
       setAtLeastNoMobilityDevice(user)
     }
     dispatch(setCurrentUser(user))
@@ -262,6 +263,23 @@ function setUser(user, fetchTrips) {
     if (!isBlank(preferredLocale)) {
       dispatch(setLocale(preferredLocale))
     }
+
+    // Also replan itinerary search for the current user profile.
+    if (
+      hasMobilityProfile &&
+      !getState().router.location.pathname.startsWith('/account')
+    ) {
+      // TODO: Refactor below.
+      // This prevents some kind of race condition whose origin I can't figure
+      // out. Unless this is called after redux catches up with routing to the '/'
+      // path, then the old path will be used and the screen won't change.
+      // Therefore, this timeout occurs so that the view of the homepage has time
+      // to render itself.
+      // FIXME: remove hack
+      setTimeout(() => {
+        dispatch(routingQuery())
+      }, 300)
+    }
   }
 }
 

lib/components/user/mobility-profile/mobility-pane.tsx

@@ -1,24 +1,17 @@
-import { Button } from 'react-bootstrap'
-import { connect } from 'react-redux'
 import { FormattedList, FormattedMessage } from 'react-intl'
 import { FormikProps } from 'formik'
-import React, { useCallback } from 'react'
+import React from 'react'
 
-import * as uiActions from '../../../actions/ui'
 import { EditedUser } from '../types'
 import { NONE_SINGLETON } from '../../../util/user'
-
-interface Props extends FormikProps<EditedUser> {
-  routeTo: (url: string) => void
-}
+import Link from '../../util/link'
 
 /**
  * Renders a button to show the mobility profile settings.
  */
-const MobilityPane = ({ routeTo, values: userData }: Props): JSX.Element => {
-  const handleClick = useCallback(() => {
-    routeTo('/account/mobilityProfile/')
-  }, [routeTo])
+const MobilityPane = ({
+  values: userData
+}: FormikProps<EditedUser>): JSX.Element => {
   const {
     isMobilityLimited,
     mobilityDevices = [],
@@ -54,15 +47,11 @@ const MobilityPane = ({ routeTo, values: userData }: Props): JSX.Element => {
           id={`components.MobilityProfile.LimitationsPane.visionLimitations.${visionLimitation}`}
         />
       </p>
-      <Button bsStyle="primary" onClick={handleClick}>
+      <Link className="btn btn-primary" to="/account/mobilityProfile/">
         <FormattedMessage id="components.MobilityProfile.MobilityPane.button" />
-      </Button>
+      </Link>
     </div>
   )
 }
 
-const mapDispatchToProps = {
-  routeTo: uiActions.routeTo
-}
-
-export default connect(null, mapDispatchToProps)(MobilityPane)
+export default MobilityPane

lib/components/user/types.ts

@@ -25,6 +25,7 @@ export type VisionLimitation = typeof visionLimitations[number]
 export interface MobilityProfile {
   isMobilityLimited: boolean
   mobilityDevices: string[]
+  mobilityMode: string
   visionLimitation: VisionLimitation
 }
 

package.json

@@ -44,7 +44,7 @@
     "@floating-ui/react": "^0.19.2",
     "@opentripplanner/base-map": "^3.2.2",
     "@opentripplanner/building-blocks": "^1.2.3",
-    "@opentripplanner/core-utils": "^11.4.4",
+    "@opentripplanner/core-utils": "11.4.3-mobility-profile",
     "@opentripplanner/endpoints-overlay": "^2.1.4",
     "@opentripplanner/from-to-location-picker": "^2.1.14",
     "@opentripplanner/geocoder": "^3.0.2",

yarn.lock

@@ -2408,6 +2408,24 @@
   resolved "https://registry.yarnpkg.com/@opentripplanner/building-blocks/-/building-blocks-1.2.3.tgz#404e8f9038867d66d55f51adf8855b1326c51ed5"
   integrity sha512-I0AxiZrTZu+e7+av4u0tHW2ijqpxH0AkLHrhf75BHf1Ep2FOGxaul/v+8UT18mNYiM5eHNstOX3XiXaDjtCUaw==
 
+"@opentripplanner/[email protected]":
+  version "11.4.3-mobility-profile"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.3-mobility-profile.tgz#b1d5675c6c1f85a3454234b720059efa03ad6ed2"
+  integrity sha512-+6IjMwXCUZHNmTLnZZ+u23Awtm2v4DcRVmkyxy8m8Dd5GxB9tMxXBhvvwxuzD2KV6Wf4tk4j+HqiAf8gW0Dfbg==
+  dependencies:
+    "@conveyal/lonlat" "^1.4.1"
+    "@mapbox/polyline" "^1.1.0"
+    "@opentripplanner/geocoder" "^3.0.0"
+    "@styled-icons/foundation" "^10.34.0"
+    "@turf/along" "^6.0.1"
+    chroma-js "^2.4.2"
+    date-fns "^2.28.0"
+    date-fns-tz "^1.2.2"
+    graphql "^16.6.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+    qs "^6.9.1"
+
 "@opentripplanner/core-utils@^11.4.0":
   version "11.4.2"
   resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-11.4.2.tgz#cc6034fb80ccda44e50f7f0a1e80a7bad8387f84"