Merge branch 'dev' into fix-nearby-filtering

Author: amy-corson-ibigroup

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

@@ -16,7 +16,6 @@ Object {
       "countryCode": "US",
     },
     "realtimeEffectsDisplayThreshold": 120,
-    "routingTypes": Array [],
     "stopViewer": Object {
       "showBlockIds": false,
     },
@@ -76,6 +75,7 @@ Object {
     "rideEstimates": Object {},
   },
   "transitIndex": Object {
+    "feeds": Array [],
     "routes": Object {},
     "routesFetchStatus": 0,
     "stops": Object {},

a11y/a11y.test.js

@@ -42,7 +42,12 @@ async function runAxeTestOnPath(otpPath) {
     page.waitForNavigation({ waitUntil: 'networkidle2' })
   ])
 
-  await expect(page).toPassAxeTests({ disabledRules })
+  await expect(page).toPassAxeTests({
+    disabledRules,
+    // FIXME: Send a PR to maplibre-gl 5.x to not populate aria-label on <div> elements.
+    // This occurs in their source code at https://github.com/maplibre/maplibre-gl-js/blob/b450876c1707ad7fc563a86b37a472578b4545dc/src/ui/marker.ts#L319.
+    exclude: '.maplibregl-marker'
+  })
   return page
 }
 

a11y/test-config.yml

@@ -9,11 +9,6 @@ api:
   # host: http://localhost:8001 # For testing against a local OTP instance
   path: /otp/routers/default
 
-# Enabled multimodal routing types (e.g. interary, profile)
-routingTypes:
-  - key: ITINERARY
-    text: Exact Time
-
 # Show/hide elevation profile chart for walk/bike legs
 # elevationProfile: true
 

example/example-config.yml

@@ -347,10 +347,6 @@ modes:
 #     # NOTE: headerGraphic requires a valid URL to a png file.
 #     headerGraphic: 'https://upload.wikimedia.org/wikipedia/commons/thumb/9/98/Trimet_logo.svg/1280px-Trimet_logo.svg.png'
 
-routingTypes:
-  - key: ITINERARY
-    text: Exact Time
-
 # Itinerary options
 itinerary:
   # Provides an array of valid mode combinations that returned itineraries will be filtered against

i18n/en-US.yml

@@ -65,6 +65,7 @@ actions:
     smsVerificationFailed: >-
       Your phone could not be verified. Perhaps the code you entered has
       expired. Please request a new code and try again.
+    tripDeleted: Your trip has been deleted.
 common:
   coordinates: "{lat}, {lon}"
   currentlySelected: " (Currently selected)"
@@ -813,6 +814,9 @@ components:
       Please check your email inbox and follow the link in the message to verify
       your email address before finishing your account setup.
     instructions2: Once you're verified, click the button below to continue.
+    instructions3: >-
+      You can plan trips and return to this page anytime to continue setting up
+      your account.
     resendVerification: Resend verification email
   ViewSwitcher:
     nearby: Nearby

i18n/fr.yml

@@ -74,6 +74,7 @@ actions:
       Votre numéro de téléphone n'a pas pu être vérifié. Le code que vous avez
       entré a peut-être expiré. Veuillez demander un nouveau code, puis
       réessayez.
+    tripDeleted: Votre trajet a été supprimé
 common:
   coordinates: "{lat}; {lon}"
   currentlySelected: " (actuellement sélectionné)"
@@ -841,6 +842,9 @@ components:
     instructions2: >-
       Une fois votre adresse vérifiée, cliquez sur le bouton ci-dessous pour
       continuer.
+    instructions3: >-
+      Vous pouvez planifier des trajets et revenir à cet écran à tout moment
+      pour poursuivre la creation de votre compte.
     resendVerification: Envoyer un nouveau message de vérification
   ViewSwitcher:
     nearby: À proximité

lib/actions/api.js

@@ -403,6 +403,15 @@ export const findingRoutes = createAction('FINDING_ROUTES')
 export const findRoutesResponse = createAction('FIND_ROUTES_RESPONSE')
 export const findRoutesError = createAction('FIND_ROUTES_ERROR')
 
+// Feeds lookup query
+
+export const findFeedsResponse = createAction('FIND_FEEDS_RESPONSE')
+export const findFeedsError = createAction('FIND_FEEDS_ERROR')
+
+export function findFeeds() {
+  return executeOTPAction('findFeeds')
+}
+
 export function findRoutesIfNeeded(params) {
   return function (dispatch, getState) {
     if (

lib/actions/apiV2.js

@@ -42,6 +42,8 @@ import {
   fetchingStopTimesForStop,
   fetchNearbyError,
   fetchNearbyResponse,
+  findFeedsError,
+  findFeedsResponse,
   findRouteError,
   findRouteResponse,
   findRoutesError,
@@ -962,6 +964,35 @@ export function findRoutes() {
   }
 }
 
+export function findFeeds() {
+  return function (dispatch, getState) {
+    dispatch(
+      createGraphQLQueryAction(
+        `query FeedsQuery {
+          feeds {
+            feedId
+            publisher {
+              name
+            }
+          }
+        }`,
+        {},
+        findFeedsResponse,
+        findFeedsError,
+        {
+          noThrottle: true,
+          rewritePayload: (payload) => {
+            if (payload.errors) {
+              return dispatch(findFeedsError(payload.errors))
+            }
+            return payload?.data?.feeds || []
+          }
+        }
+      )
+    )
+  }
+}
+
 export const findPatternsForRoute = (params) =>
   function (dispatch, getState) {
     const state = getState()
@@ -1324,6 +1355,7 @@ const retrieveServiceTimeRangeIfNeeded = () =>
 
 export default {
   fetchNearby,
+  findFeeds,
   findPatternsForRoute,
   findRoute,
   findRoutes,

lib/actions/user.js

@@ -17,6 +17,7 @@ import {
 } from '../util/user'
 import {
   formattedToastSuccessMessage,
+  toastMessageOnPlaceChanged,
   toastPromise
 } from '../components/util/toasts'
 import { isBlank } from '../util/ui'
@@ -581,11 +582,10 @@ export function confirmAndDeleteUserMonitoredTrip(tripId, intl) {
     )
     const requestUrl = `${apiBaseUrl}${API_MONITORED_TRIP_PATH}/${tripId}`
 
-    const { message, status } = await secureFetch(
-      requestUrl,
-      accessToken,
-      apiKey,
-      'DELETE'
+    const { message, status } = await toastPromise(
+      secureFetch(requestUrl, accessToken, apiKey, 'DELETE'),
+      intl.formatMessage({ id: 'actions.user.tripDeleted' }),
+      intl
     )
     if (status === 'success') {
       // Reload user's monitored trips after deletion.
@@ -802,7 +802,11 @@ export function saveUserPlace(placeToSave, placeIndex, intl) {
       loggedInUser.savedLocations[placeIndex] = placeToSave
     }
 
-    return dispatch(createOrUpdateUser(loggedInUser, intl))
+    return toastPromise(
+      dispatch(createOrUpdateUser(loggedInUser, intl)),
+      toastMessageOnPlaceChanged(placeToSave, intl, 'Remembered'),
+      intl
+    )
   }
 }
 
@@ -895,10 +899,8 @@ export function rememberPlace(placeTypeLocation, intl) {
           intl.formatMessage({ id: 'actions.user.mustBeLoggedInToSavePlace' })
         )
       }
-      return UserActionResult.FAILURE
     } else if (persistenceMode.isLocalStorage) {
       dispatch(rememberLocalUserPlace(placeTypeLocation))
-      return UserActionResult.SUCCESS
     }
   }
 }

lib/components/app/print-layout.tsx

@@ -1,12 +1,17 @@
 import { connect } from 'react-redux'
 import { FormattedMessage, injectIntl, IntlShape } from 'react-intl'
 import { Itinerary } from '@opentripplanner/types'
+import coreUtils from '@opentripplanner/core-utils'
 import React, { Component } from 'react'
 
-import * as apiActions from '../../actions/api'
 import * as formActions from '../../actions/form'
+import * as narrativeActions from '../../actions/narrative'
 import { AppReduxState } from '../../util/state-types'
-import { getActiveItinerary, getActiveSearch } from '../../util/state'
+import {
+  getActiveItineraries,
+  getActiveSearch,
+  getVisibleItineraryIndex
+} from '../../util/state'
 import { summarizeQuery } from '../form/user-settings-i18n'
 import { User } from '../user/types'
 import DefaultMap from '../map/default-map'
@@ -19,7 +24,8 @@ type Props = {
   intl: IntlShape
   itinerary: Itinerary
   location?: { search?: string }
-  parseUrlQueryString: (params?: any, source?: string) => any
+  parseUrlQueryString: (params?: any, source?: string) => void
+  setVisibleItinerary: (params: { index: number }) => void
   user: User
 }
 
@@ -37,6 +43,23 @@ class PrintLayout extends Component<Props> {
     }
   }
 
+  componentDidUpdate() {
+    const { activeSearch, itinerary, setVisibleItinerary } = this.props
+
+    // Display the desired itinerary on map.
+    if (!itinerary) {
+      const { ui_activeItinerary: uiActiveItinerary } =
+        coreUtils.query.getUrlParams() || {}
+      if (
+        activeSearch &&
+        uiActiveItinerary !== undefined &&
+        uiActiveItinerary !== '-1'
+      ) {
+        setVisibleItinerary({ index: +uiActiveItinerary })
+      }
+    }
+  }
+
   render() {
     const { activeSearch, intl, itinerary, user } = this.props
     const printVerb = intl.formatMessage({ id: 'common.forms.print' })
@@ -68,16 +91,17 @@ const mapStateToProps = (state: AppReduxState) => {
   const activeSearch = getActiveSearch(state)
   const { localUser, loggedInUser } = state.user
   const user = loggedInUser || localUser
+  const itineraries = getActiveItineraries(state)
   return {
     activeSearch,
-    itinerary: getActiveItinerary(state) as Itinerary,
+    itinerary: itineraries[getVisibleItineraryIndex(state)] as Itinerary,
     user
   }
 }
 
 const mapDispatchToProps = {
   parseUrlQueryString: formActions.parseUrlQueryString,
-  routingQuery: apiActions.routingQuery
+  setVisibleItinerary: narrativeActions.setVisibleItinerary
 }
 
 export default connect(