Merge branch 'dev' into save-trip-fixes

__tests__/components/viewers/nearby-view.js

@@ -10,7 +10,9 @@ import nearbyScootersInvalidDates from './nearby-mocks/nearby-scooters-invalid-d
 describe('components > viewers > nearby view', () => {
   it('renders nothing on a blank page', () => {
     const mockState = getMockInitialState()
-    mockState.otp.transitIndex.nearby = []
+    mockState.otp.transitIndex.nearby = {
+      data: []
+    }
     mockState.router.location = { query: {} }
     expect(
       mockWithProvider(NearbyView, {}, mockState).snapshot()
@@ -19,7 +21,9 @@ describe('components > viewers > nearby view', () => {
 
   it('renders proper scooter dates', () => {
     const mockState = getMockInitialState()
-    mockState.otp.transitIndex.nearby = nearbyScootersInvalidDates
+    mockState.otp.transitIndex.nearby = {
+      data: nearbyScootersInvalidDates
+    }
     mockState.router.location = { query: {} }
     expect(
       mockWithProvider(NearbyView, {}, mockState).snapshot()

example-config.yml

@@ -361,6 +361,11 @@ itinerary:
   # mutedErrors:
   #   - NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW
 
+  # List of OTP2 errors that should only be displayed alone, alongside no  
+  # other errors. 
+  # exclusiveErrors:
+  #   - NO_TRANSIT_CONNECTION
+
   # The following settings must be set to these values to use the new
   # "Metro" UI. The settings can be used without the Metro UI, but
   # this may have unexpected effects.

i18n/en-US.yml

@@ -384,7 +384,7 @@ components:
       body: >-
         No transit connection was found between your origin and destination on
         the selected day of service, using the vehicle types you selected.
-      header: No transit connections
+      header: No itineraries found
     NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW:
       body: >-
         A transit connection was found, but it was outside the search window,

lib/actions/apiV2.js

@@ -482,7 +482,10 @@ export const fetchNearby = (position, radius) => {
           error.cause = payload.errors
           throw error
         }
-        return mergeSameStops(payload.data?.nearest?.edges)
+        return {
+          coords: { lat, lon },
+          data: mergeSameStops(payload.data?.nearest?.edges)
+        }
       }
     }
   )
@@ -1128,6 +1131,14 @@ export function routingQuery(searchId = null, updateSearchInReducer) {
                 }
               }
 
+              // If there are no itineraries, generate an error
+              // so we're not left with an empty results container.
+              if (withCollapsedShortNames.length === 0) {
+                response.data.plan.routingErrors.push({
+                  code: 'NO_TRANSIT_CONNECTION'
+                })
+              }
+
               return {
                 index,
                 response: {

lib/components/app/view-switcher.tsx

@@ -1,19 +1,16 @@
-import { connect } from 'react-redux'
 import { FormattedMessage, useIntl } from 'react-intl'
 import React from 'react'
 
-import { AppReduxState } from '../../util/state-types'
 import Link from '../util/link'
 
 type Props = {
-  mainPath: string
   sticky?: boolean
 }
 /**
  * This component is a switcher between
  * the main views of the application.
  */
-const ViewSwitcher = ({ mainPath, sticky }: Props) => {
+const ViewSwitcher = ({ sticky }: Props) => {
   const intl = useIntl()
   return (
     <div
@@ -34,26 +31,17 @@ const ViewSwitcher = ({ mainPath, sticky }: Props) => {
           : {}
       }
     >
-      <Link isActive={mainPath === '/'} to="/">
+      <Link to="/" tracking>
         <FormattedMessage id="components.BatchRoutingPanel.shortTitle" />
       </Link>
-      <Link isActive={mainPath === '/route'} to="/route">
+      <Link to="/route" tracking>
         <FormattedMessage id="components.RouteViewer.shortTitle" />
       </Link>
-      <Link isActive={mainPath === '/nearby'} to="/nearby">
+      <Link to="/nearby" tracking>
         <FormattedMessage id="components.ViewSwitcher.nearby" />
       </Link>
     </div>
   )
 }
 
-// connect to the redux store
-
-const mapStateToProps = (state: AppReduxState) => {
-  const pathParts = state.router.location.pathname.split('/')
-  return {
-    mainPath: `/${pathParts[1]}`
-  }
-}
-
-export default connect(mapStateToProps)(ViewSwitcher)
+export default ViewSwitcher