From 240588a1ec90a04a1d422eaad2996eb0c5b8ac81 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 30 Jul 2021 10:02:34 -0400
Subject: [PATCH 01/15] fix(field-trip): reverse outbound/inbound in field trip
 list view

fix ibi-group/trimet-mod-otp#303
---
 lib/components/admin/field-trip-list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/components/admin/field-trip-list.js b/lib/components/admin/field-trip-list.js
index 6b1de4994..5ae1de8cb 100644
--- a/lib/components/admin/field-trip-list.js
+++ b/lib/components/admin/field-trip-list.js
@@ -223,10 +223,10 @@ class FieldTripRequestRecord extends Component {
           </span>
           <span style={{display: 'inline-block', width: '50%'}}>
             <span style={{marginLeft: '10px'}}>
-              {this._getStatusIcon(inboundTripStatus)} Inbound
+              {this._getStatusIcon(outboundTripStatus)} Outbound
             </span>
             <span style={{marginLeft: '10px'}}>
-              {this._getStatusIcon(outboundTripStatus)} Outbound
+              {this._getStatusIcon(inboundTripStatus)} Inbound
             </span>
           </span>
           <span style={{display: 'block', fontSize: '.9em'}}>

From 34679f4dc2dc6719cfca7c3979f2aa023422c396 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 30 Jul 2021 10:38:05 -0400
Subject: [PATCH 02/15] fix(field-trip): refactor trip status icon

this does not resolve entirely ibi-group/trimet-mod-otp#302 (a backend change is also needed), but
it does DRY things out a bit and make things a bit easier to follow

re ibi-group/trimet-mod-otp#302
---
 lib/components/admin/field-trip-list.js |  9 +++------
 lib/components/admin/trip-status.js     | 12 +++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/components/admin/field-trip-list.js b/lib/components/admin/field-trip-list.js
index 5ae1de8cb..794c101a5 100644
--- a/lib/components/admin/field-trip-list.js
+++ b/lib/components/admin/field-trip-list.js
@@ -10,6 +10,7 @@ import Loading from '../narrative/loading'
 import {getVisibleRequests, TABS} from '../../util/call-taker'
 import {FETCH_STATUS} from '../../util/constants'
 
+import FieldTripStatusIcon from './field-trip-status-icon'
 import {FieldTripRecordButton, WindowHeader} from './styled'
 import DraggableWindow from './draggable-window'
 
@@ -186,10 +187,6 @@ class FieldTripRequestRecord extends Component {
     onClick(request)
   }
 
-  _getStatusIcon = (status) => status
-    ? <Icon className='text-success' type='check' />
-    : <Icon className='text-warning' type='exclamation-circle' />
-
   render () {
     const {active, request} = this.props
     const style = {
@@ -223,10 +220,10 @@ class FieldTripRequestRecord extends Component {
           </span>
           <span style={{display: 'inline-block', width: '50%'}}>
             <span style={{marginLeft: '10px'}}>
-              {this._getStatusIcon(outboundTripStatus)} Outbound
+              <FieldTripStatusIcon status={outboundTripStatus} /> Outbound
             </span>
             <span style={{marginLeft: '10px'}}>
-              {this._getStatusIcon(inboundTripStatus)} Inbound
+              <FieldTripStatusIcon status={inboundTripStatus} /> Inbound
             </span>
           </span>
           <span style={{display: 'block', fontSize: '.9em'}}>
diff --git a/lib/components/admin/trip-status.js b/lib/components/admin/trip-status.js
index 629390e02..7de04c4d9 100644
--- a/lib/components/admin/trip-status.js
+++ b/lib/components/admin/trip-status.js
@@ -5,9 +5,9 @@ import { connect } from 'react-redux'
 
 import * as fieldTripActions from '../../actions/field-trip'
 import * as formActions from '../../actions/form'
-import Icon from '../narrative/icon'
 import { getTripFromRequest } from '../../util/call-taker'
 
+import FieldTripStatusIcon from './field-trip-status-icon'
 import {
   Bold,
   Button,
@@ -47,13 +47,11 @@ class TripStatus extends Component {
     viewRequestTripItineraries(request, outbound)
   }
 
-  _renderStatusIcon = () => this.props.status
-    ? <Icon className='text-success' type='check' />
-    : <Icon className='text-warning' type='exclamation-circle' />
+  _tripIsPlanned = () => this.props.status && this.props.trip
 
   _renderTripStatus = () => {
-    const { status, trip } = this.props
-    if (!status || !trip) {
+    const { trip } = this.props
+    if (!this._tripIsPlanned()) {
       return (
         <Para>
           No itineraries planned! Click Plan to plan trip.
@@ -92,7 +90,7 @@ class TripStatus extends Component {
     return (
       <Full>
         <Header>
-          {this._renderStatusIcon()}
+          <FieldTripStatusIcon status={this._tripIsPlanned()} />
           {outbound ? 'Outbound' : 'Inbound'} trip
           <Button bsSize='xs' onClick={this._onPlanTrip}>Plan</Button>
           <Button

From ade25491cd4f8fae2e9ee6f30dc851f68961cb93 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 30 Jul 2021 14:06:38 -0400
Subject: [PATCH 03/15] refactor: add status icon component

---
 lib/components/admin/field-trip-status-icon.js | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 lib/components/admin/field-trip-status-icon.js

diff --git a/lib/components/admin/field-trip-status-icon.js b/lib/components/admin/field-trip-status-icon.js
new file mode 100644
index 000000000..6ec9202cb
--- /dev/null
+++ b/lib/components/admin/field-trip-status-icon.js
@@ -0,0 +1,11 @@
+import React from 'react'
+
+import Icon from '../narrative/icon'
+
+const FieldTripStatusIcon = ({ status }) => {
+  return status
+    ? <Icon className='text-success' type='check' />
+    : <Icon className='text-warning' type='exclamation-circle' />
+}
+
+export default FieldTripStatusIcon

From 173a312999ba05ea1464815992cafe5545dc4055 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 2 Aug 2021 15:29:45 -0400
Subject: [PATCH 04/15] fix(date-time-options): fix search options css (add
 flex)

fix ibi-group/trimet-mod-otp#304
---
 lib/components/admin/call-taker.css           | 10 ++++
 lib/components/app/call-taker-panel.js        |  8 ++--
 .../form/call-taker/date-time-options.js      | 46 +++++++++----------
 .../form/call-taker/mode-dropdown.js          |  1 -
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/lib/components/admin/call-taker.css b/lib/components/admin/call-taker.css
index 9f85cf73f..a0a0a2f56 100644
--- a/lib/components/admin/call-taker.css
+++ b/lib/components/admin/call-taker.css
@@ -9,3 +9,13 @@
 .otp .advanced-search-options {
   box-shadow: 0px 5px 3px 0px rgba(0,0,0,0.32157);
 }
+
+.otp .search-options {
+  display: flex;
+  justify-content: space-between;
+  flex-flow: row wrap;
+}
+
+.otp .search-options > * {
+  margin-bottom: 5px;
+}
diff --git a/lib/components/app/call-taker-panel.js b/lib/components/app/call-taker-panel.js
index 49c9318f2..06fb6a524 100644
--- a/lib/components/app/call-taker-panel.js
+++ b/lib/components/app/call-taker-panel.js
@@ -187,7 +187,7 @@ class CallTakerPanel extends Component {
               onClick={this._addPlace}
               to={to}
             />
-            <div className='search-options' style={{height: '30px'}}>
+            <div className='search-options'>
               <DateTimeOptions
                 date={date}
                 departArrive={departArrive}
@@ -208,9 +208,7 @@ class CallTakerPanel extends Component {
                 onClick={this._planTrip}
                 style={{
                   fontSize: '13px',
-                  padding: '0px 10px',
-                  position: 'absolute',
-                  right: '6px'
+                  padding: '0px 10px'
                 }} >
                 Plan
               </Button>
@@ -261,7 +259,7 @@ class CallTakerPanel extends Component {
                 right: '0',
                 // FIXME: This top pixel value can be variable dependent on
                 // height of the form above. It may need to be specified differently
-                top: 193 + intermediatePlaces.length * 45
+                top: 210 + intermediatePlaces.length * 45
               }}
             />
           </div>
diff --git a/lib/components/form/call-taker/date-time-options.js b/lib/components/form/call-taker/date-time-options.js
index fd0e5cb5f..45fab3615 100644
--- a/lib/components/form/call-taker/date-time-options.js
+++ b/lib/components/form/call-taker/date-time-options.js
@@ -190,28 +190,26 @@ export default class DateTimeOptions extends Component {
             <option key={o.value} {...o} />
           ))}
         </select>
-        <span style={{display: 'inline-flex'}}>
-          <OverlayTrigger
-            overlay={<Tooltip id='time-tooltip'>{cleanTime}</Tooltip>}
-            placement='bottom'
-            trigger={['focus', 'hover']}
-          >
-            <input
-              className='datetime-slim'
-              onChange={this.handleTimeChange}
-              onFocus={this.handleTimeFocus}
-              onKeyDown={onKeyDown}
-              style={{
-                fontSize: 'inherit',
-                lineHeight: '.8em',
-                marginLeft: '3px',
-                padding: '0px',
-                width: '50px'
-              }}
-              value={timeInput || dateTime.format('H:mm')}
-            />
-          </OverlayTrigger>
-        </span>
+        <OverlayTrigger
+          overlay={<Tooltip id='time-tooltip'>{cleanTime}</Tooltip>}
+          placement='bottom'
+          trigger={['focus', 'hover']}
+        >
+          <input
+            className='datetime-slim'
+            onChange={this.handleTimeChange}
+            onFocus={this.handleTimeFocus}
+            onKeyDown={onKeyDown}
+            style={{
+              fontSize: 'inherit',
+              lineHeight: '.8em',
+              marginLeft: '3px',
+              padding: '0px',
+              width: '50px'
+            }}
+            value={timeInput || dateTime.format('H:mm')}
+          />
+        </OverlayTrigger>
         <input
           className='datetime-slim'
           onChange={this.handleDateChange}
@@ -219,11 +217,9 @@ export default class DateTimeOptions extends Component {
           style={{
             border: 'none',
             fontSize: '14px',
-            left: '146px',
             lineHeight: '1em',
             outline: 'none',
-            position: 'absolute',
-            width: '101px'
+            width: '107px'
           }}
           type='date'
           value={dateTime.format('YYYY-MM-DD')}
diff --git a/lib/components/form/call-taker/mode-dropdown.js b/lib/components/form/call-taker/mode-dropdown.js
index f9ac748f7..ac3c469ae 100644
--- a/lib/components/form/call-taker/mode-dropdown.js
+++ b/lib/components/form/call-taker/mode-dropdown.js
@@ -74,7 +74,6 @@ export default class ModeDropdown extends Component {
         onBlur={this._setMode}
         onChange={this._onChange}
         onKeyDown={onKeyDown}
-        style={{position: 'absolute', right: '60px'}}
         value={this.modeToOptionValue(mode)}
       >
         {this._getModeOptions().map(o => (

From a99744fd52aec3870de904faa616f4b42a5d90c8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 4 Aug 2021 12:41:02 -0400
Subject: [PATCH 05/15] refactor: address PR comments

---
 lib/components/admin/call-taker.css                 | 1 +
 lib/components/admin/field-trip-status-icon.js      | 6 +++---
 lib/components/admin/trip-status.js                 | 2 +-
 lib/components/app/call-taker-panel.js              | 2 +-
 lib/components/form/call-taker/date-time-options.js | 7 ++-----
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/components/admin/call-taker.css b/lib/components/admin/call-taker.css
index a0a0a2f56..917ec1eb4 100644
--- a/lib/components/admin/call-taker.css
+++ b/lib/components/admin/call-taker.css
@@ -18,4 +18,5 @@
 
 .otp .search-options > * {
   margin-bottom: 5px;
+  height: 24px;
 }
diff --git a/lib/components/admin/field-trip-status-icon.js b/lib/components/admin/field-trip-status-icon.js
index 6ec9202cb..ce44b2718 100644
--- a/lib/components/admin/field-trip-status-icon.js
+++ b/lib/components/admin/field-trip-status-icon.js
@@ -2,10 +2,10 @@ import React from 'react'
 
 import Icon from '../narrative/icon'
 
-const FieldTripStatusIcon = ({ status }) => {
-  return status
+const FieldTripStatusIcon = ({ status }) => (
+  status
     ? <Icon className='text-success' type='check' />
     : <Icon className='text-warning' type='exclamation-circle' />
-}
+)
 
 export default FieldTripStatusIcon
diff --git a/lib/components/admin/trip-status.js b/lib/components/admin/trip-status.js
index 7de04c4d9..c85194305 100644
--- a/lib/components/admin/trip-status.js
+++ b/lib/components/admin/trip-status.js
@@ -47,7 +47,7 @@ class TripStatus extends Component {
     viewRequestTripItineraries(request, outbound)
   }
 
-  _tripIsPlanned = () => this.props.status && this.props.trip
+  _tripIsPlanned = () => Boolean(this.props.status && this.props.trip)
 
   _renderTripStatus = () => {
     const { trip } = this.props
diff --git a/lib/components/app/call-taker-panel.js b/lib/components/app/call-taker-panel.js
index 06fb6a524..5a52281e3 100644
--- a/lib/components/app/call-taker-panel.js
+++ b/lib/components/app/call-taker-panel.js
@@ -208,7 +208,7 @@ class CallTakerPanel extends Component {
                 onClick={this._planTrip}
                 style={{
                   fontSize: '13px',
-                  padding: '0px 10px'
+                  padding: '1px 10px'
                 }} >
                 Plan
               </Button>
diff --git a/lib/components/form/call-taker/date-time-options.js b/lib/components/form/call-taker/date-time-options.js
index 45fab3615..15f5ae942 100644
--- a/lib/components/form/call-taker/date-time-options.js
+++ b/lib/components/form/call-taker/date-time-options.js
@@ -186,9 +186,7 @@ export default class DateTimeOptions extends Component {
           onKeyDown={onKeyDown}
           value={departArrive}
         >
-          {departureOptions.map(o => (
-            <option key={o.value} {...o} />
-          ))}
+          {departureOptions.map(o => <option key={o.value} {...o} />)}
         </select>
         <OverlayTrigger
           overlay={<Tooltip id='time-tooltip'>{cleanTime}</Tooltip>}
@@ -215,11 +213,10 @@ export default class DateTimeOptions extends Component {
           onChange={this.handleDateChange}
           onKeyDown={onKeyDown}
           style={{
-            border: 'none',
             fontSize: '14px',
             lineHeight: '1em',
             outline: 'none',
-            width: '107px'
+            width: '109px'
           }}
           type='date'
           value={dateTime.format('YYYY-MM-DD')}

From e8722a507e0ec9b959c571882c0adb7bc1d8d6be Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 5 Aug 2021 12:02:27 -0400
Subject: [PATCH 06/15] refactor(field-trip): change status icon prop name

---
 lib/components/admin/field-trip-list.js        | 4 ++--
 lib/components/admin/field-trip-status-icon.js | 4 ++--
 lib/components/admin/trip-status.js            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/components/admin/field-trip-list.js b/lib/components/admin/field-trip-list.js
index 794c101a5..2cabcd1cb 100644
--- a/lib/components/admin/field-trip-list.js
+++ b/lib/components/admin/field-trip-list.js
@@ -220,10 +220,10 @@ class FieldTripRequestRecord extends Component {
           </span>
           <span style={{display: 'inline-block', width: '50%'}}>
             <span style={{marginLeft: '10px'}}>
-              <FieldTripStatusIcon status={outboundTripStatus} /> Outbound
+              <FieldTripStatusIcon ok={Boolean(outboundTripStatus)} /> Outbound
             </span>
             <span style={{marginLeft: '10px'}}>
-              <FieldTripStatusIcon status={inboundTripStatus} /> Inbound
+              <FieldTripStatusIcon ok={Boolean(inboundTripStatus)} /> Inbound
             </span>
           </span>
           <span style={{display: 'block', fontSize: '.9em'}}>
diff --git a/lib/components/admin/field-trip-status-icon.js b/lib/components/admin/field-trip-status-icon.js
index ce44b2718..e7ed9b0eb 100644
--- a/lib/components/admin/field-trip-status-icon.js
+++ b/lib/components/admin/field-trip-status-icon.js
@@ -2,8 +2,8 @@ import React from 'react'
 
 import Icon from '../narrative/icon'
 
-const FieldTripStatusIcon = ({ status }) => (
-  status
+const FieldTripStatusIcon = ({ ok }) => (
+  ok
     ? <Icon className='text-success' type='check' />
     : <Icon className='text-warning' type='exclamation-circle' />
 )
diff --git a/lib/components/admin/trip-status.js b/lib/components/admin/trip-status.js
index c85194305..79d8e8ba8 100644
--- a/lib/components/admin/trip-status.js
+++ b/lib/components/admin/trip-status.js
@@ -90,7 +90,7 @@ class TripStatus extends Component {
     return (
       <Full>
         <Header>
-          <FieldTripStatusIcon status={this._tripIsPlanned()} />
+          <FieldTripStatusIcon ok={this._tripIsPlanned()} />
           {outbound ? 'Outbound' : 'Inbound'} trip
           <Button bsSize='xs' onClick={this._onPlanTrip}>Plan</Button>
           <Button

From c6f7904d5f71bedd61ff4afc440cf5addc4eed2a Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 30 Aug 2021 22:49:23 -0700
Subject: [PATCH 07/15] fix(api): use apiKey if configured for certain requests

---
 lib/actions/api.js | 64 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/lib/actions/api.js b/lib/actions/api.js
index 4be9c5bf9..cadf0c87a 100644
--- a/lib/actions/api.js
+++ b/lib/actions/api.js
@@ -723,18 +723,7 @@ function createQueryAction (endpoint, responseAction, errorAction, options = {})
   return async function (dispatch, getState) {
     const state = getState()
     const { config } = state.otp
-    let url
-    if (
-      options.serviceId &&
-        config.alternateTransitIndex &&
-        config.alternateTransitIndex.services.includes(options.serviceId)
-    ) {
-      console.log('Using alt service for ' + options.serviceId)
-      url = config.alternateTransitIndex.apiRoot + endpoint
-    } else {
-      const api = config.api
-      url = `${api.host}${api.port ? ':' + api.port : ''}${api.path}/${endpoint}`
-    }
+    const url = makeApiUrl()
 
     if (!options.noThrottle) {
       // don't make a request to a URL that has already seen the same request
@@ -750,9 +739,10 @@ function createQueryAction (endpoint, responseAction, errorAction, options = {})
         throttledUrls[throttleKey] = now()
       }
     }
+
     let payload
     try {
-      const response = await fetch(url, options.fetchOptions)
+      const response = await fetch(url, makeApiFetchOptions(config, options))
       if (response.status >= 400) {
         const error = new Error('Received error from server')
         error.response = response
@@ -775,6 +765,54 @@ function createQueryAction (endpoint, responseAction, errorAction, options = {})
   }
 }
 
+/**
+ * Creates the URL to use for making an API request.
+ *
+ * @param  {Object} config   The app-wide config
+ * @param  {string} endpoint The API endpoint path
+ * @param  {Object} options  The options object for the API request
+ * @return {string}          The URL to use for making the http request
+ */
+function makeApiUrl (config, endpoint, options) {
+  let url
+  if (
+    options.serviceId &&
+      config.alternateTransitIndex &&
+      config.alternateTransitIndex.services.includes(options.serviceId)
+  ) {
+    console.log('Using alt service for ' + options.serviceId)
+    url = config.alternateTransitIndex.apiRoot + endpoint
+  } else {
+    const api = config.api
+    url = `${api.host}${api.port ? ':' + api.port : ''}${api.path}/${endpoint}`
+  }
+  return url
+}
+
+/**
+ * Add the necessary API key headers if using an API Key.
+ *
+ * @param  {Object} config  The app-wide config
+ * @param  {Object} options The options for the API request
+ * @return {Object}         The options to send to the fetch function when
+ *                      making the http request for the API endpoint.
+ */
+function makeApiFetchOptions (config, options) {
+  const fetchOptions = options.fetchOptions || {}
+  const apiKey = config?.persistence?.otp_middleware?.apiKey
+  if (apiKey) {
+    const headers = fetchOptions.headers || {}
+    fetchOptions.headers = {
+      'x-api-key': apiKey,
+      ...headers
+    }
+    if (!fetchOptions.mode) {
+      fetchOptions.mode = 'cors'
+    }
+  }
+  return fetchOptions
+}
+
 // TODO: Determine how we might be able to use GraphQL with the alternative
 // transit index. Currently this is not easily possible because the alternative
 // transit index does not have support for GraphQL and handling both Rest and

From 527c6dc9422326f6cabfc70bf018e78dd65cb1d3 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 31 Aug 2021 10:44:24 -0400
Subject: [PATCH 08/15] refactor(api): pass args to makeApiUrl

---
 lib/actions/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/actions/api.js b/lib/actions/api.js
index cadf0c87a..0c5c814c9 100644
--- a/lib/actions/api.js
+++ b/lib/actions/api.js
@@ -723,7 +723,7 @@ function createQueryAction (endpoint, responseAction, errorAction, options = {})
   return async function (dispatch, getState) {
     const state = getState()
     const { config } = state.otp
-    const url = makeApiUrl()
+    const url = makeApiUrl(config, endpoint, options)
 
     if (!options.noThrottle) {
       // don't make a request to a URL that has already seen the same request

From 3c951a26afb60c2879264ecc186e107ceb3805f8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 1 Sep 2021 16:24:46 -0400
Subject: [PATCH 09/15] refactor(api): use getOtpFetchOptions for rest queries

---
 lib/actions/api.js | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/lib/actions/api.js b/lib/actions/api.js
index 0c5c814c9..2bd38d20c 100644
--- a/lib/actions/api.js
+++ b/lib/actions/api.js
@@ -742,7 +742,7 @@ function createQueryAction (endpoint, responseAction, errorAction, options = {})
 
     let payload
     try {
-      const response = await fetch(url, makeApiFetchOptions(config, options))
+      const response = await fetch(url, getOtpFetchOptions(state))
       if (response.status >= 400) {
         const error = new Error('Received error from server')
         error.response = response
@@ -789,30 +789,6 @@ function makeApiUrl (config, endpoint, options) {
   return url
 }
 
-/**
- * Add the necessary API key headers if using an API Key.
- *
- * @param  {Object} config  The app-wide config
- * @param  {Object} options The options for the API request
- * @return {Object}         The options to send to the fetch function when
- *                      making the http request for the API endpoint.
- */
-function makeApiFetchOptions (config, options) {
-  const fetchOptions = options.fetchOptions || {}
-  const apiKey = config?.persistence?.otp_middleware?.apiKey
-  if (apiKey) {
-    const headers = fetchOptions.headers || {}
-    fetchOptions.headers = {
-      'x-api-key': apiKey,
-      ...headers
-    }
-    if (!fetchOptions.mode) {
-      fetchOptions.mode = 'cors'
-    }
-  }
-  return fetchOptions
-}
-
 // TODO: Determine how we might be able to use GraphQL with the alternative
 // transit index. Currently this is not easily possible because the alternative
 // transit index does not have support for GraphQL and handling both Rest and

From d56d8ae62ee2c2aa0e7f3d25419f86a5fe986d0c Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Tue, 7 Sep 2021 16:51:16 -0700
Subject: [PATCH 10/15] fix(itinerary): calculate and display non-transit fares
 in batch mode

Fixes potential regression in https://github.com/opentripplanner/otp-react-redux/pull/375
---
 lib/components/narrative/default/default-itinerary.js | 10 ++++++----
 lib/util/state.js                                     | 10 +++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js
index be3f34276..599a18ebf 100644
--- a/lib/components/narrative/default/default-itinerary.js
+++ b/lib/components/narrative/default/default-itinerary.js
@@ -8,10 +8,11 @@ import FieldTripGroupSize from '../../admin/field-trip-itinerary-group-size'
 import NarrativeItinerary from '../narrative-itinerary'
 import ItineraryBody from '../line-itin/connected-itinerary-body'
 import SimpleRealtimeAnnotation from '../simple-realtime-annotation'
+import { getTotalFare } from '../../../util/state'
 
 import ItinerarySummary from './itinerary-summary'
 
-const { calculateFares, isBicycle, isMicromobility, isTransit } = coreUtils.itinerary
+const { isBicycle, isMicromobility, isTransit } = coreUtils.itinerary
 
 /**
  * Obtains the description of an itinerary in the given locale.
@@ -125,14 +126,12 @@ const ITINERARY_ATTRIBUTES = [
     id: 'cost',
     order: 2,
     render: (itinerary, options) => {
-      // Get unformatted transit fare portion only (in cents).
-      const { transitFare } = calculateFares(itinerary)
       return (
         <FormattedNumber
           currency={options.currency}
           currencyDisplay='narrowSymbol'
           style='currency'
-          value={transitFare / 100}
+          value={getTotalFare(itinerary, options.configCosts) / 100}
         />
       )
     }
@@ -194,6 +193,7 @@ class DefaultItinerary extends NarrativeItinerary {
   render () {
     const {
       active,
+      configCosts,
       currency,
       expanded,
       itinerary,
@@ -246,6 +246,7 @@ class DefaultItinerary extends NarrativeItinerary {
                 }
                 options.LegIcon = LegIcon
                 options.timeFormat = use24HourFormat ? 'H:mm' : 'h:mm a'
+                options.configCosts = configCosts
                 options.currency = currency
                 return (
                   <li className={`${attribute.id}${isSelected ? ' main' : ''}`} key={attribute.id}>
@@ -276,6 +277,7 @@ class DefaultItinerary extends NarrativeItinerary {
 
 const mapStateToProps = (state, ownProps) => {
   return {
+    configCosts: state.otp.config.itinerary?.costs,
     // The configured (ambient) currency is needed for rendering the cost
     // of itineraries whether they include a fare or not, in which case
     // we show $0.00 or its equivalent in the configured currency and selected locale.
diff --git a/lib/util/state.js b/lib/util/state.js
index 0e1f1fa3b..79165f63a 100644
--- a/lib/util/state.js
+++ b/lib/util/state.js
@@ -289,8 +289,9 @@ function sortItineraries (type, direction, a, b, config) {
       if (direction === 'ASC') return a.duration - b.duration
       else return b.duration - a.duration
     case 'COST':
-      const aTotal = getTotalFare(a, config)
-      const bTotal = getTotalFare(b, config)
+      const configCosts = config.itinerary?.costs
+      const aTotal = getTotalFare(a, configCosts)
+      const bTotal = getTotalFare(b, configCosts)
       if (direction === 'ASC') return aTotal - bTotal
       else return bTotal - aTotal
     default:
@@ -329,7 +330,7 @@ function calculateItineraryCost (itinerary, config = {}) {
   // If config contains values to override defaults, apply those.
   const configWeights = config.itinerary && config.itinerary.weights
   if (configWeights) Object.assign(weights, configWeights)
-  return getTotalFare(itinerary, config) * weights.fareFactor +
+  return getTotalFare(itinerary, config.itinerary?.costs) * weights.fareFactor +
     itinerary.duration * weights.durationFactor +
     itinerary.walkDistance * weights.walkReluctance +
     getDriveTime(itinerary) * weights.driveReluctance +
@@ -368,13 +369,12 @@ const DEFAULT_COSTS = {
  * FIXME: Move to otp-ui?
  * TODO: Add GBFS fares
  */
-function getTotalFare (itinerary, config = {}) {
+export function getTotalFare (itinerary, configCosts = {}) {
   // Get transit/TNC fares.
   const {maxTNCFare, transitFare} = calculateFares(itinerary)
   // Start with default cost values.
   const costs = DEFAULT_COSTS
   // If config contains values to override defaults, apply those.
-  const configCosts = config.itinerary && config.itinerary.costs
   if (configCosts) Object.assign(costs, configCosts)
   // Calculate total cost from itinerary legs.
   let drivingCost = 0

From 588be2f3dd25a8360b95240d9432b2248a30e1ae Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Tue, 7 Sep 2021 16:52:07 -0700
Subject: [PATCH 11/15] fix(itinerary): correctly use sort type for displaying
 selected value

---
 lib/components/narrative/narrative-itineraries-header.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/components/narrative/narrative-itineraries-header.js b/lib/components/narrative/narrative-itineraries-header.js
index 5b8671e3c..54300bc81 100644
--- a/lib/components/narrative/narrative-itineraries-header.js
+++ b/lib/components/narrative/narrative-itineraries-header.js
@@ -95,7 +95,7 @@ export default function NarrativeItinerariesHeader ({
             <select
               onBlur={onSortChange}
               onChange={onSortChange}
-              value={sort.value}
+              value={sort.type}
             >
               <option value='BEST'>Best option</option>
               <option value='DURATION'>Duration</option>

From 51df97f601759a4213062eb8174ede71e5670083 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Tue, 7 Sep 2021 16:57:30 -0700
Subject: [PATCH 12/15] refactor(itinerary): remove unused function

---
 lib/util/state.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/util/state.js b/lib/util/state.js
index 79165f63a..32b9128f8 100644
--- a/lib/util/state.js
+++ b/lib/util/state.js
@@ -394,13 +394,6 @@ export function getTotalFare (itinerary, configCosts = {}) {
   return bikeshareCost + drivingCost + transitFare + maxTNCFare * 100
 }
 
-export function getTotalFareAsString (itinerary) {
-  // Get centsToString formatter.
-  const {centsToString} = calculateFares(itinerary)
-  // Return total fare as formatted string.
-  return centsToString(getTotalFare(itinerary))
-}
-
 /**
  * Get the active itinerary/profile for the active search object
  * @param {Object} state the redux state object

From c2e4ca882f5e29a9b28ccad0a68e72ada0852f58 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 8 Sep 2021 11:08:16 +0100
Subject: [PATCH 13/15] fix: remove dead links

---
 lib/components/user/terms-of-use-pane.js | 16 ++++++++++++++--
 lib/util/auth.js                         |  7 -------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/components/user/terms-of-use-pane.js b/lib/components/user/terms-of-use-pane.js
index e7c0e94fd..b6f67f25c 100644
--- a/lib/components/user/terms-of-use-pane.js
+++ b/lib/components/user/terms-of-use-pane.js
@@ -1,4 +1,5 @@
 import React from 'react'
+import { connect } from 'react-redux'
 import { Checkbox, ControlLabel, FormGroup } from 'react-bootstrap'
 
 import { TERMS_OF_SERVICE_PATH, TERMS_OF_STORAGE_PATH } from '../../util/constants'
@@ -10,12 +11,15 @@ const TermsOfUsePane = ({
   disableCheckTerms,
   handleBlur,
   handleChange,
+  otpConfig,
   values: userData
 }) => {
   const {
     hasConsentedToTerms,
     storeTripHistory
   } = userData
+  const { persistence } = otpConfig
+  const { terms_of_storage: termsOfStorageSet } = persistence
 
   return (
     <div>
@@ -46,11 +50,19 @@ const TermsOfUsePane = ({
         >
           {/* TODO: Implement the link */}
             Optional: I consent to the Trip Planner storing my historical planned trips in order to
-            improve transit services in my area. <a href={`/#${TERMS_OF_STORAGE_PATH}`} target='_blank'>More info...</a>
+            improve transit services in my area. {termsOfStorageSet && <a href={`/#${TERMS_OF_STORAGE_PATH}`} target='_blank'>More info...</a>}
         </Checkbox>
       </FormGroup>
     </div>
   )
 }
+const mapStateToProps = (state, ownProps) => {
+  return {
+    otpConfig: state.otp.config
+  }
+}
+
+const mapDispatchToProps = {
+}
 
-export default TermsOfUsePane
+export default connect(mapStateToProps, mapDispatchToProps)(TermsOfUsePane)
diff --git a/lib/util/auth.js b/lib/util/auth.js
index e96aae9d4..4d4a940f2 100644
--- a/lib/util/auth.js
+++ b/lib/util/auth.js
@@ -8,13 +8,6 @@ export const accountLinks = [
   {
     text: 'My account',
     url: ACCOUNT_PATH
-  },
-  {
-    // Add a target attribute if you need the link to open in a new window, etc.
-    // (supports the same values as <a target=... >).
-    // target: '_blank',
-    text: 'Help',
-    url: '/help'
   }
 ]
 

From 930a4a70377fbdb913b653ff77dd7ef1aa3c0e7f Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 8 Sep 2021 15:02:47 +0100
Subject: [PATCH 14/15] refactor(terms-of-use-pane): optimize redux state
 access

---
 lib/components/user/terms-of-use-pane.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/components/user/terms-of-use-pane.js b/lib/components/user/terms-of-use-pane.js
index b6f67f25c..9388a6028 100644
--- a/lib/components/user/terms-of-use-pane.js
+++ b/lib/components/user/terms-of-use-pane.js
@@ -11,15 +11,13 @@ const TermsOfUsePane = ({
   disableCheckTerms,
   handleBlur,
   handleChange,
-  otpConfig,
+  termsOfStorageSet,
   values: userData
 }) => {
   const {
     hasConsentedToTerms,
     storeTripHistory
   } = userData
-  const { persistence } = otpConfig
-  const { terms_of_storage: termsOfStorageSet } = persistence
 
   return (
     <div>
@@ -58,7 +56,7 @@ const TermsOfUsePane = ({
 }
 const mapStateToProps = (state, ownProps) => {
   return {
-    otpConfig: state.otp.config
+    termsOfStorageSet: state.otp.config.persistence?.terms_of_storage
   }
 }
 

From 62278865204a45e1afa33483a5742f794c7f5b5e Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 8 Sep 2021 15:38:50 +0100
Subject: [PATCH 15/15] refactor: address pr feedback

---
 example-config.yml                       | 4 ++++
 lib/components/user/terms-of-use-pane.js | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/example-config.yml b/example-config.yml
index 95fb8ca8f..889ba5ab8 100644
--- a/example-config.yml
+++ b/example-config.yml
@@ -42,6 +42,10 @@ api:
 persistence:
   enabled: true
   strategy: localStorage
+  ### This variable hides the "more info" link when accepting the terms of storage.
+  ### If no terms of storage page content is set, this removes an otherwise dead link
+  ### False is default in that if the value isn't set, the link isn't shown
+  # terms_of_storage: true
 
 ### If using the OTP Middleware to store user profiles
 ### with Auth0 as the authentication mechanism,
diff --git a/lib/components/user/terms-of-use-pane.js b/lib/components/user/terms-of-use-pane.js
index 9388a6028..e7d860412 100644
--- a/lib/components/user/terms-of-use-pane.js
+++ b/lib/components/user/terms-of-use-pane.js
@@ -54,13 +54,9 @@ const TermsOfUsePane = ({
     </div>
   )
 }
-const mapStateToProps = (state, ownProps) => {
+const mapStateToProps = (state) => {
   return {
     termsOfStorageSet: state.otp.config.persistence?.terms_of_storage
   }
 }
-
-const mapDispatchToProps = {
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(TermsOfUsePane)
+export default connect(mapStateToProps)(TermsOfUsePane)