Merge pull request #9 from opentripplanner/react-native-improvements

React native improvements

Author: evansiroky

Diff for: __tests__/actions/__snapshots__/api.js.snap

@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`actions > api should make a query to OTP 1`] = `"/api/plan?arriveBy=false&fromPlace=12%2C34&showIntermediateStops=true&toPlace=34%2C12"`;
+
+exports[`actions > api should make a query to OTP 2`] = `
+Array [
+  Array [
+    Object {
+      "type": "PLAN_REQUEST",
+    },
+  ],
+  Array [
+    Object {
+      "payload": Object {
+        "fake": "response",
+      },
+      "type": "PLAN_RESPONSE",
+    },
+  ],
+]
+`;

Diff for: __tests__/actions/api.js

@@ -0,0 +1,57 @@
+/* globals describe, expect, it, jest */
+
+import nock from 'nock'
+
+import {planTrip} from '../../lib/actions/api'
+
+function timeoutPromise (ms) {
+  return new Promise((resolve, reject) => {
+    setTimeout(resolve, ms)
+  })
+}
+
+const planTripAction = planTrip()
+
+describe('actions > api', () => {
+  it('should make a query to OTP', async () => {
+    nock('http://mock-host.com')
+      .get(/api\/plan/)
+      .reply(200, {
+        fake: 'response'
+      })
+      .on('request', (req, interceptor) => {
+        expect(req.path).toMatchSnapshot()
+      })
+
+    const mockDispatch = jest.fn()
+    planTripAction(mockDispatch, () => {
+      return {
+        otp: {
+          config: {
+            api: {
+              host: 'http://mock-host.com',
+              path: '/api',
+              port: 80
+            }
+          },
+          currentQuery: {
+            from: {
+              lat: 12,
+              lon: 34
+            },
+            to: {
+              lat: 34,
+              lon: 12
+            }
+          },
+          searches: []
+        }
+      }
+    })
+
+    // wait for request to complete
+    await timeoutPromise(100)
+
+    expect(mockDispatch.mock.calls).toMatchSnapshot()
+  })
+})

Diff for: __tests__/util/__snapshots__/state.js.snap

@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`util > state getDefaultQuery should parse window hash if available 1`] = `
+Object {
+  "date": "2017-02-03",
+  "departArrive": "DEPART",
+  "from": Object {
+    "lat": "12",
+    "lon": "34",
+    "name": "12.00000, 34.00000",
+  },
+  "mode": undefined,
+  "time": "12:34",
+  "to": Object {
+    "lat": "34",
+    "lon": "12",
+    "name": "34.00000, 12.00000",
+  },
+  "type": "ITINERARY",
+}
+`;

Diff for: __tests__/util/itenerary.js renamed to __tests__/util/itinerary.js

@@ -0,0 +1,10 @@
+/* globals describe, expect, it */
+
+import {getDefaultQuery} from '../../lib/util/state'
+
+describe('util > state', () => {
+  it('getDefaultQuery should parse window hash if available', () => {
+    window.location.hash = '#plan?arriveBy=false&date=2017-02-03&fromPlace=12,34&toPlace=34,12&time=12:34'
+    expect(getDefaultQuery()).toMatchSnapshot()
+  })
+})

Diff for: __tests__/util/state.js

@@ -18,3 +18,12 @@
   margin: 0px;
   padding: 0px;
 }
+
+button.header, button.step, .intermediate-stops button  {
+  background: inherit;
+  color: inherit;
+  border: 0;
+  text-align: inherit;
+  text-decoration: none;
+  width: 100%;
+}

Diff for: dist/index.css

@@ -1,14 +1,19 @@
+/* globals fetch */
+
 import deepEqual from 'deep-equal'
 import { createAction } from 'redux-actions'
-import fetch from 'isomorphic-fetch'
 import qs from 'qs'
 
+if (typeof (fetch) === 'undefined') {
+  require('isomorphic-fetch')
+}
+
 import { hasValidLocation } from '../util/state'
 
 export const receivedPlanResponse = createAction('PLAN_RESPONSE')
 export const requestPlanResponse = createAction('PLAN_REQUEST')
 
-export function planTrip () {
+export function planTrip (customOtpQueryBuilder) {
   return function (dispatch, getState) {
     const otpState = getState().otp
     const latest = otpState.searches.length && otpState.searches[otpState.searches.length - 1]
@@ -19,7 +24,8 @@ export function planTrip () {
     }
     if (!hasValidLocation(otpState, 'from') || !hasValidLocation(otpState, 'to')) return // TODO: replace with isQueryValid?
     dispatch(requestPlanResponse())
-    const url = constructPlanQuery(getState().otp.config.api, getState().otp.currentQuery)
+    const queryBuilderFn = customOtpQueryBuilder || constructPlanQuery
+    const url = queryBuilderFn(otpState.config.api, otpState.currentQuery)
     // setURLSearch(url)
     fetch(url)
       .then(response => {
@@ -41,24 +47,13 @@ function constructPlanQuery (api, query) {
   const planEndpoint = `${api.host}:${api.port}${api.path}/plan`
   const { mode, time, date } = query
   const params = {
+    arriveBy: query.departArrive === 'ARRIVE',
+    date,
     fromPlace: `${query.from.lat},${query.from.lon}`,
     showIntermediateStops: true,
     toPlace: `${query.to.lat},${query.to.lon}`,
-    mode
-  }
-  switch (query.departArrive) {
-    case 'ARRIVE':
-      params.arriveBy = true
-      params.date = date
-      params.time = time
-      break
-    case 'DEPART':
-      params.arriveBy = false
-      params.date = date
-      params.time = time
-      break
-    default:
-      break
+    mode,
+    time
   }
   const stringParams = qs.stringify(params)
   // TODO: set url hash based on params

Diff for: dist/index.css.map

@@ -7,7 +7,6 @@ import { connect } from 'react-redux'
 import { setDepart, setDate, setTime } from '../../actions/form'
 
 class DateTimeSelector extends Component {
-
   static propTypes = {
     location: PropTypes.object,
     label: PropTypes.string,

Diff for: example.css

@@ -4,7 +4,6 @@ import { connect } from 'react-redux'
 import { getActiveSearch } from '../../util/state'
 
 class ErrorMessage extends Component {
-
   static propTypes = {
     itineraries: PropTypes.array
   }

Diff for: lib/actions/api.js

@@ -7,7 +7,6 @@ import Geocoder from 'react-select-geocoder'
 import { setLocation, clearLocation } from '../../actions/map'
 
 class LocationField extends Component {
-
   static propTypes = {
     location: PropTypes.object,
     label: PropTypes.string,
@@ -21,12 +20,12 @@ class LocationField extends Component {
   _onChange = (value, option) => {
     console.log(value, option)
     if (value && value.geometry) {
-      let location = lonlat.fromCoordinates(value.geometry.coordinates)
+      const location = lonlat.fromCoordinates(value.geometry.coordinates)
       location.name = value.properties.label
       this.props.setLocation(this.props.type, location)
     } else if (value.feature) {
       // TODO: remove temp fix required for handling r-s-g geolocated option
-      let location = lonlat.fromCoordinates(value.feature.geometry.coordinates)
+      const location = lonlat.fromCoordinates(value.feature.geometry.coordinates)
       location.name = value.feature.properties.label
       this.props.setLocation(this.props.type, location)
     } else {

Diff for: lib/components/form/date-time-selector.js

@@ -5,7 +5,6 @@ import { connect } from 'react-redux'
 import { setMode } from '../../actions/form'
 
 class ModeSelector extends Component {
-
   static propTypes = {
     location: PropTypes.object,
     label: PropTypes.string,

Diff for: lib/components/form/error-message.js

@@ -5,7 +5,6 @@ import { connect } from 'react-redux'
 import { planTrip } from '../../actions/api'
 
 class PlanTripButton extends Component {
-
   static propTypes = {
     onClick: PropTypes.func
   }

Diff for: lib/components/form/location-field.js

@@ -10,7 +10,6 @@ import { constructLocation } from '../../util/map'
 import { getActiveItinerary, getActiveSearch } from '../../util/state'
 
 class BaseMap extends Component {
-
   static propTypes = {
     config: PropTypes.object,
     mapClick: PropTypes.func,

Diff for: lib/components/form/mode-selector.js

@@ -5,7 +5,6 @@ import Endpoint from './endpoint'
 import { setLocation } from '../../actions/map'
 
 class EndpointsOverlay extends Component {
-
   static propTypes = {
     query: PropTypes.object
   }