Field trip module

example.js

@@ -20,6 +20,7 @@ import {
   CallTakerWindows,
   DefaultItinerary,
   DefaultMainPanel,
+  FieldTripWindows,
   MobileSearchScreen,
   ResponsiveWebapp,
   createCallTakerReducer,
@@ -89,7 +90,12 @@ const components = {
     : isBatchRoutingEnabled
       ? BatchRoutingPanel
       : DefaultMainPanel,
-  MapWindows: isCallTakerModuleEnabled ? CallTakerWindows : null,
+  MapWindows: isCallTakerModuleEnabled
+    ? () => <>
+      <CallTakerWindows />
+      <FieldTripWindows />
+    </>
+    : null,
   MobileSearchScreen: isBatchRoutingEnabled
     ? BatchSearchScreen
     : MobileSearchScreen,

lib/actions/call-taker.js

@@ -1,8 +1,9 @@
 import { getUrlParams } from '@opentripplanner/core-utils/lib/query'
+import { serialize } from 'object-to-formdata'
 import qs from 'qs'
 import { createAction } from 'redux-actions'
 
-import {searchToQuery} from '../util/call-taker'
+import {searchToQuery, sessionIsInvalid} from '../util/call-taker'
 import {URL_ROOT} from '../util/constants'
 import {getTimestamp} from '../util/state'
 
@@ -29,12 +30,16 @@ export function endCall () {
   return function (dispatch, getState) {
     const {callTaker, otp} = getState()
     const {activeCall, session} = callTaker
+    const { sessionId } = session
     if (sessionIsInvalid(session)) return
-    // Make POST request to store call.
-    const callData = new FormData()
-    callData.append('sessionId', session.sessionId)
-    callData.append('call.startTime', activeCall.startTime)
-    callData.append('call.endTime', getTimestamp())
+    // Make POST request to store new call.
+    const callData = serialize({
+      sessionId,
+      call: {
+        startTime: activeCall.startTime,
+        endTime: getTimestamp()
+      }
+    })
     fetch(`${otp.config.datastoreUrl}/calltaker/call`,
       {method: 'POST', body: callData}
     )
@@ -84,9 +89,8 @@ function newSession (datastoreUrl, verifyLoginUrl, redirect) {
     .then(res => res.json())
     .then(data => {
       const {sessionId: session} = data
-      console.log('newSession success: ' + session)
       const windowUrl = `${verifyLoginUrl}?${qs.stringify({session, redirect})}`
-      console.log('redirecting to: ' + windowUrl)
+      // Redirect to login url.
       window.location = windowUrl
     })
     .catch(error => {
@@ -104,8 +108,8 @@ function checkSession (datastoreUrl, sessionId) {
       .then(res => res.json())
       .then(session => dispatch(storeSession({session})))
       .catch(error => {
-        console.error('checkSession error', error)
         dispatch(storeSession({session: null}))
+        alert(`Error establishing auth session: ${JSON.stringify(error)}`)
       })
   }
 }
@@ -120,28 +124,12 @@ export function fetchCalls () {
     if (sessionIsInvalid(callTaker.session)) return
     const {datastoreUrl} = otp.config
     const {sessionId} = callTaker.session
-    const limit = 10
+    const limit = 30
     fetch(`${datastoreUrl}/calltaker/call?${qs.stringify({limit, sessionId})}`)
       .then(res => res.json())
-      .then(calls => {
-        console.log('GET calls response', calls)
-        dispatch(receivedCalls({calls}))
-      })
-      .catch(err => {
-        alert(`Could not fetch calls: ${JSON.stringify(err)}`)
-      })
-  }
-}
-
-/**
- * @return {boolean} - whether a calltaker session is invalid
- */
-function sessionIsInvalid (session) {
-  if (!session || !session.sessionId) {
-    console.error('No valid OTP datastore session found.')
-    return true
+      .then(calls => dispatch(receivedCalls({calls})))
+      .catch(err => alert(`Error fetching calls: ${JSON.stringify(err)}`))
   }
-  return false
 }
 
 /**
@@ -161,19 +149,13 @@ export function saveQueriesForCall (call) {
       const search = otp.searches[searchId]
       const query = searchToQuery(search, call, otp.config)
       const {sessionId} = callTaker.session
-      const queryData = new FormData()
-      queryData.append('sessionId', sessionId)
-      queryData.append('query.queryParams', query.queryParams)
-      queryData.append('query.fromPlace', query.fromPlace)
-      queryData.append('query.toPlace', query.toPlace)
-      queryData.append('query.timeStamp', query.timeStamp)
-      queryData.append('query.call.id', call.id)
+      const queryData = serialize({ sessionId, query })
       return fetch(`${datastoreUrl}/calltaker/callQuery?sessionId=${sessionId}`,
         {method: 'POST', body: queryData}
       )
         .then(res => res.json())
         .catch(err => {
-          alert(`Could not fetch calls: ${JSON.stringify(err)}`)
+          alert(`Error storing call queries: ${JSON.stringify(err)}`)
         })
     }))
   }
@@ -195,7 +177,7 @@ export function fetchQueries (callId) {
         dispatch(receivedQueries({callId, queries}))
       })
       .catch(err => {
-        alert(`Could not fetch calls: ${JSON.stringify(err)}`)
+        alert(`Error fetching queries: ${JSON.stringify(err)}`)
       })
   }
 }