Merge branch 'dev' into date-restricted-requests

lib/components/app/batch-routing-panel.tsx

@@ -3,12 +3,14 @@ import { CSSTransition, TransitionGroup } from 'react-transition-group'
 import { FormattedMessage, injectIntl, IntlShape } from 'react-intl'
 import React, { Component, FormEvent } from 'react'
 
+import * as apiActions from '../../actions/api'
 import {
   advancedPanelClassName,
   mainPanelClassName,
   transitionDuration,
   TransitionStyles
 } from '../form/styled'
+import { alertUserTripPlan } from '../form/util'
 import { getActiveSearch, getShowUserSettings } from '../../util/state'
 import { getPersistenceMode } from '../../util/user'
 import AdvancedSettingsPanel from '../form/advanced-settings-panel'
@@ -22,9 +24,11 @@ import ViewerContainer from '../viewers/viewer-container'
 
 interface Props {
   activeSearch: any
+  currentQuery: any
   intl: IntlShape
   mainPanelContent: number
   mobile?: boolean
+  routingQuery: () => void
   showUserSettings: boolean
 }
 
@@ -75,7 +79,13 @@ class BatchRoutingPanel extends Component<Props> {
   handleSubmit = (e: FormEvent) => e.preventDefault()
 
   handlePlanTripClick = () => {
-    this.setState({ planTripClicked: true })
+    const { currentQuery, intl, routingQuery } = this.props
+    alertUserTripPlan(
+      intl,
+      currentQuery,
+      () => this.setState({ planTripClicked: true }),
+      routingQuery
+    )
   }
 
   render() {
@@ -128,6 +138,7 @@ class BatchRoutingPanel extends Component<Props> {
                 >
                   <AdvancedSettingsPanel
                     closeAdvancedSettings={this.closeAdvancedSettings}
+                    handlePlanTrip={this.handlePlanTripClick}
                     innerRef={this._advancedSettingRef}
                     setCloseAdvancedSettingsWithDelay={
                       this.setCloseAdvancedSettingsWithDelay
@@ -223,12 +234,21 @@ const mapStateToProps = (state: any) => {
     (state.user.loggedInUser?.hasConsentedToTerms ||
       getPersistenceMode(state.otp.config.persistence).isLocalStorage)
   const { mainPanelContent } = state.otp.ui
+  const currentQuery = state.otp.currentQuery
 
   return {
     activeSearch: getActiveSearch(state),
+    currentQuery,
     mainPanelContent,
     showUserSettings
   }
 }
 
-export default connect(mapStateToProps)(injectIntl(BatchRoutingPanel))
+const mapDispatchToProps = {
+  routingQuery: apiActions.routingQuery
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(injectIntl(BatchRoutingPanel))

lib/components/form/advanced-settings-panel.tsx

@@ -30,7 +30,8 @@ import {
   onSettingsUpdate,
   pipe,
   populateSettingWithIcon,
-  setModeButton
+  setModeButton,
+  tripPlannerValidationErrors
 } from './util'
 import { setModeButtonEnabled } from './batch-settings'
 import { styledCheckboxCss } from './styled'
@@ -111,8 +112,11 @@ const DtSelectorContainer = styled.div`
 `
 
 const AdvancedSettingsPanel = ({
+  autoPlan,
   closeAdvancedSettings,
+  currentQuery,
   enabledModeButtons,
+  handlePlanTrip,
   innerRef,
   modeButtonOptions,
   modeSettingDefinitions,
@@ -121,8 +125,11 @@ const AdvancedSettingsPanel = ({
   setCloseAdvancedSettingsWithDelay,
   setQueryParam
 }: {
+  autoPlan: boolean
   closeAdvancedSettings: () => void
+  currentQuery: any
   enabledModeButtons: string[]
+  handlePlanTrip: () => void
   innerRef: RefObject<HTMLDivElement>
   modeButtonOptions: ModeButtonDefinition[]
   modeSettingDefinitions: ModeSetting[]
@@ -177,6 +184,15 @@ const AdvancedSettingsPanel = ({
     )
   )
 
+
+  const tripFormErrors = tripPlannerValidationErrors(currentQuery, intl)
+
+  const closePanel = useCallback(() => {
+    // Only autoplan if there are no validation errors
+    tripFormErrors.length === 0 && autoPlan && handlePlanTrip()
+    closeAdvancedSettings()
+  }, [autoPlan, closeAdvancedSettings, handlePlanTrip, tripFormErrors.length])
+
   const handleModeButtonToggle = setModeButton(
     enabledModeButtons,
     onSettingsUpdate(setQueryParam)
@@ -189,8 +205,8 @@ const AdvancedSettingsPanel = ({
   const onSaveAndReturnClick = useCallback(async () => {
     await setCloseAdvancedSettingsWithDelay()
     setClosingBySave(true)
-    closeAdvancedSettings()
-  }, [closeAdvancedSettings, setCloseAdvancedSettingsWithDelay])
+    closePanel()
+  }, [closePanel, setCloseAdvancedSettingsWithDelay])
 
   return (
     <PanelOverlay className="advanced-settings" ref={innerRef}>
@@ -199,7 +215,7 @@ const AdvancedSettingsPanel = ({
           aria-label={closeButtonText}
           id="close-advanced-settings-button"
           onClick={() => {
-            closeAdvancedSettings()
+            closePanel()
           }}
           title={closeButtonText}
         >
@@ -263,9 +279,12 @@ const mapStateToProps = (state: AppReduxState) => {
     state.otp.modeSettingDefinitions || [],
     modes?.initialState?.modeSettingValues || {}
   )
+
+  const { autoPlan } = state.otp.config
   const saveAndReturnButton =
     state.otp.config?.advancedSettingsPanel?.saveAndReturnButton
   return {
+    autoPlan: autoPlan !== false,
     currentQuery: state.otp.currentQuery,
     // TODO: Duplicated in apiv2.js
     enabledModeButtons:

lib/components/form/batch-settings.tsx

@@ -5,9 +5,8 @@ import { ModeButtonDefinition } from '@opentripplanner/types'
 import { Search } from '@styled-icons/fa-solid/Search'
 import { SyncAlt } from '@styled-icons/fa-solid/SyncAlt'
 import { useIntl } from 'react-intl'
-import React, { useCallback, useContext, useState } from 'react'
+import React, { useContext, useState } from 'react'
 
-import * as apiActions from '../../actions/api'
 import * as formActions from '../../actions/form'
 import { ComponentContext } from '../../util/contexts'
 import { getActiveSearch, hasValidLocation } from '../../util/state'
@@ -16,7 +15,6 @@ import { StyledIconWrapper } from '../util/styledIcon'
 
 import {
   addModeButtonIcon,
-  alertUserTripPlan,
   modesQueryParamConfig,
   onSettingsUpdate,
   pipe,
@@ -39,7 +37,6 @@ type Props = {
   modeButtonOptions: ModeButtonDefinition[]
   onPlanTripClick: () => void
   openAdvancedSettings: () => void
-  routingQuery: any
   setQueryParam: (evt: any) => void
   spacedOutModeSelector?: boolean
 }
@@ -64,7 +61,6 @@ function BatchSettings({
   modeButtonOptions,
   onPlanTripClick,
   openAdvancedSettings,
-  routingQuery,
   setQueryParam,
   spacedOutModeSelector
 }: Props) {
@@ -80,10 +76,6 @@ function BatchSettings({
     pipe(addModeButtonIcon(ModeIcon), setModeButtonEnabled(enabledModeButtons))
   )
 
-  const _planTrip = useCallback(() => {
-    alertUserTripPlan(intl, currentQuery, onPlanTripClick, routingQuery)
-  }, [currentQuery, intl, onPlanTripClick, routingQuery])
-
   const baseColor = getBaseColor()
 
   const accentColor = getDarkenedBaseColor()
@@ -109,7 +101,7 @@ function BatchSettings({
         />
         <PlanTripButton
           id="plan-trip"
-          onClick={_planTrip}
+          onClick={onPlanTripClick}
           title={intl.formatMessage({
             id: 'components.BatchSettings.planTripTooltip'
           })}
@@ -151,7 +143,6 @@ const mapStateToProps = (state: any) => {
 }
 
 const mapDispatchToProps = {
-  routingQuery: apiActions.routingQuery,
   setQueryParam: formActions.setQueryParam
 }
 

lib/components/form/util.tsx

@@ -72,13 +72,10 @@ export const setModeButton =
     )
   }
 
-export const alertUserTripPlan = (
-  intl: IntlShape,
+export const tripPlannerValidationErrors = (
   currentQuery: any,
-  onPlanTripClick: () => void,
-  routingQuery: () => any
-): void => {
-  // Check for any validation issues in query.
+  intl: IntlShape
+): string[] => {
   const issues: string[] = []
   if (!hasValidLocation(currentQuery, 'from')) {
     issues.push(intl.formatMessage({ id: 'components.BatchSettings.origin' }))
@@ -88,6 +85,17 @@ export const alertUserTripPlan = (
       intl.formatMessage({ id: 'components.BatchSettings.destination' })
     )
   }
+  return issues
+}
+
+export const alertUserTripPlan = (
+  intl: IntlShape,
+  currentQuery: any,
+  onPlanTripClick: () => void,
+  routingQuery: () => any
+): void => {
+  // Check for any validation issues in query and alert user.
+  const issues = tripPlannerValidationErrors(currentQuery, intl)
   onPlanTripClick()
   if (issues.length > 0) {
     // TODO: replace with less obtrusive validation.

lib/components/mobile/batch-search-screen.tsx

@@ -4,13 +4,15 @@ import { injectIntl, IntlShape } from 'react-intl'
 import React, { Component } from 'react'
 import styled from 'styled-components'
 
+import * as apiActions from '../../actions/api'
 import * as uiActions from '../../actions/ui'
 import {
   advancedPanelClassName,
   mainPanelClassName,
   transitionDuration,
   TransitionStyles
 } from '../form/styled'
+import { alertUserTripPlan } from '../form/util'
 import { MobileScreens } from '../../actions/ui-constants'
 import AdvancedSettingsPanel from '../form/advanced-settings-panel'
 import BatchSettings from '../form/batch-settings'
@@ -43,8 +45,10 @@ const MobileSearchSettings = styled.div<{
 `
 
 interface Props {
+  currentQuery: any
   intl: IntlShape
   map: React.ReactElement
+  routingQuery: any
   setMobileScreen: (screen: number) => void
 }
 
@@ -63,7 +67,10 @@ class BatchSearchScreen extends Component<Props> {
   _advancedSettingRef = React.createRef<HTMLDivElement>()
 
   handlePlanTripClick = () => {
-    this.setState({ planTripClicked: true })
+    const { currentQuery, intl, routingQuery } = this.props
+    alertUserTripPlan(intl, currentQuery, routingQuery, () =>
+      this.setState({ planTripClicked: true })
+    )
   }
 
   openAdvancedSettings = () => {
@@ -159,6 +166,7 @@ class BatchSearchScreen extends Component<Props> {
                   >
                     <AdvancedSettingsPanel
                       closeAdvancedSettings={this.closeAdvancedSettings}
+                      handlePlanTrip={this.handlePlanTripClick}
                       innerRef={this._advancedSettingRef}
                       setCloseAdvancedSettingsWithDelay={
                         this.setCloseAdvancedSettingsWithDelay
@@ -180,8 +188,19 @@ class BatchSearchScreen extends Component<Props> {
 
 // connect to the redux store
 
+const mapStateToProps = (state: any) => {
+  const currentQuery = state.otp.currentQuery
+  return {
+    currentQuery
+  }
+}
+
 const mapDispatchToProps = {
+  routingQuery: apiActions.routingQuery,
   setMobileScreen: uiActions.setMobileScreen
 }
 
-export default connect(null, mapDispatchToProps)(injectIntl(BatchSearchScreen))
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(injectIntl(BatchSearchScreen))

lib/util/viewer.js

@@ -21,13 +21,15 @@ export function getSecondsUntilDeparture(
 ) {
   let time
   if (useSchedule) {
-    time = useArrivalTime
-      ? stopTime.scheduledArrival
-      : stopTime.scheduledDeparture
+    time =
+      useArrivalTime && !!stopTime.scheduledArrival
+        ? stopTime.scheduledArrival
+        : stopTime.scheduledDeparture
   } else {
-    time = useArrivalTime
-      ? stopTime.realtimeArrival
-      : stopTime.realtimeDeparture
+    time =
+      useArrivalTime && !!stopTime.realtimeArrival
+        ? stopTime.realtimeArrival
+        : stopTime.realtimeDeparture
   }
 
   return time + stopTime.serviceDay - Date.now() / 1000

percy/percy.test.js

@@ -42,6 +42,12 @@ async function loadPath(otpPath) {
   return page
 }
 
+const openEditIfNeeded = async (page, isMobile) => {
+  if (isMobile) {
+    await page.click('button.edit-search-button')
+  }
+}
+
 beforeAll(async () => {
   try {
     // Launch OTP-RR web server
@@ -114,9 +120,7 @@ async function executeTest(page, isMobile, isCallTaker) {
 
   if (!isCallTaker) {
     // Edit trip params [mobile-specific]
-    if (isMobile) {
-      await page.click('button.edit-search-button')
-    }
+    await openEditIfNeeded(page, isMobile)
 
     // Change the modes: Activate Transit and remove Bike.
     await page.click('label[title="Transit"]')
@@ -148,6 +152,8 @@ async function executeTest(page, isMobile, isCallTaker) {
     await page.waitForTimeout(500)
     // Delete both origin and destination
 
+    await openEditIfNeeded(page, isMobile)
+
     await page.click('.from-form-control')
     await page.waitForTimeout(300)
     // Click the clear button next to it

yarn.lock

@@ -7476,9 +7476,9 @@ electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.811:
   integrity sha512-bpLc4QU4B8PYmdO4MSu2ZBTMD8lAaEXRS43C09lB31BvYwuk9UxgBRXbY5OJBw7VuMGcg2MZG5FyTaP9u4PQnw==
 
 elliptic@^6.5.3, elliptic@^6.5.4:
-  version "6.5.7"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
-  integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.0.tgz#5919ec723286c1edf28685aa89261d4761afa210"
+  integrity sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"