inital flow type fixes

lib/editor/components/EditorInput.js

@@ -283,6 +283,7 @@ export default class EditorInput extends React.Component<Props> {
               onChange={this._onHourMinuteInputChange}
               seconds={value && value * 60}
               standaloneInput
+              showSeconds={false}
             />
           </FormGroup>
         )

lib/editor/components/EntityDetails.js

@@ -10,7 +10,7 @@ import * as mapActions from '../actions/map'
 import ActiveTripPatternList from '../containers/ActiveTripPatternList'
 import { getZones, getEditorTable, canApproveGtfs } from '../util'
 import { getTableById } from '../util/gtfs'
-import type {Entity, Feed, GtfsSpecField, GtfsStop, GtfsLocation, GtfsLocationGroup, Pattern, Project} from '../../types'
+import type {Entity, Feed, GtfsSpecField, GtfsStop, GtfsLocation, Pattern, Project} from '../../types'
 import type {EditorTables, ManagerUserState, MapState} from '../../types/reducers'
 import type {EditorValidationIssue} from '../util/validation/common'
 
@@ -25,7 +25,9 @@ type Props = {
   activeEntity: Entity,
   activeEntityId: number,
   activePattern: Pattern,
-  activePatternStops: Array<GtfsStop | GtfsLocation | GtfsLocationGroup>,
+  activePatternLocationGroups: Array<GtfsLocation>,
+  activePatternLocations: Array<GtfsLocation>,
+  activePatternStops: Array<GtfsStop>,
   deleteEntity: typeof activeActions.deleteGtfsEntity,
   entities: Array<Entity>,
   entityEdited: boolean,

lib/editor/components/ExceptionDate.js

@@ -9,7 +9,7 @@ import {toast} from 'react-toastify'
 
 import {updateActiveGtfsEntity} from '../actions/active'
 import type {ScheduleException} from '../../types'
-import type {EditorValidationIssue} from '../util/validation'
+import type {EditorValidationIssue} from '../util/validation/common'
 import { getComponentMessages } from '../../common/util/config'
 
 import {sortDates} from './ExceptionDateRange'

lib/editor/components/ExceptionDateRange.js

@@ -9,7 +9,7 @@ import {updateActiveGtfsEntity} from '../actions/active'
 import { getComponentMessages } from '../../common/util/config'
 import {modifyRangeOfDates, updateDates} from '../../common/util/exceptions'
 import type {ExceptionDate, ScheduleException, ScheduleExceptionDateRange} from '../../types'
-import type {EditorValidationIssue} from '../util/validation'
+import type {EditorValidationIssue} from '../util/validation/common'
 
 import {inputStyleProps} from './ExceptionDate'
 import ExceptionValidationErrorsList from './ExceptionValidationErrorsList'

lib/editor/components/ExceptionValidationErrorsList.js

@@ -3,7 +3,7 @@
 import React from 'react'
 
 import { getComponentMessages } from '../../common/util/config'
-import type { EditorValidationIssue } from '../util/validation'
+import type { EditorValidationIssue } from '../util/validation/common'
 
 const VALIDATION_ERROR_LIMIT = 3
 

lib/editor/components/map/PatternLocationMarker.js

@@ -50,7 +50,7 @@ export default class PatternLocationMarker extends Component<Props> {
 
   _onChangeTimeInLocation = (value: number) => {
     const {activePattern, index, updatePatternStops} = this.props
-    const patternStops = {activePattern}
+    const { patternStops } = activePattern
     if (patternStops[index].hasOwnProperty('defaultDwellTime')) {
       patternStops[index].defaultDwellTime = value
       updatePatternStops(activePattern, patternStops)
@@ -61,7 +61,7 @@ export default class PatternLocationMarker extends Component<Props> {
 
   _onChangeTravelTime = (value: number) => {
     const {activePattern, index, updatePatternStops} = this.props
-    const patternStops = {activePattern}
+    const { patternStops } = activePattern
     if (patternStops[index].hasOwnProperty('defaultTravelTime')) {
       patternStops[index].defaultTravelTime = value
       updatePatternStops(activePattern, patternStops)
@@ -140,7 +140,7 @@ export default class PatternLocationMarker extends Component<Props> {
                             controlId='defaultTravelTime'>
                             <ControlLabel>Travel time</ControlLabel>
                             <MinuteSecondInput
-                              seconds={patternStop.defaultTravelTime}
+                              seconds={patternStop.defaultTravelTime || 0}
                               onChange={this._onChangeTravelTime} />
                           </FormGroup>
                         </Col>
@@ -149,7 +149,7 @@ export default class PatternLocationMarker extends Component<Props> {
                             controlId='defaultTimeInLocation'>
                             <ControlLabel>Time in location</ControlLabel>
                             <MinuteSecondInput
-                              seconds={patternStop.defaultDwellTime}
+                              seconds={patternStop.defaultDwellTime || 0}
                               onChange={this._onChangeTimeInLocation} />
                           </FormGroup>
                         </Col>

lib/editor/components/map/PatternStopMarker.js

@@ -120,7 +120,7 @@ export default class PatternStopMarker extends Component<Props> {
                         controlId='defaultTravelTime'>
                         <ControlLabel>Travel time</ControlLabel>
                         <MinuteSecondInput
-                          seconds={patternStop.defaultTravelTime}
+                          seconds={patternStop.defaultTravelTime || 0}
                           onChange={this._onChangeTravelTime} />
                       </FormGroup>
                     </Col>
@@ -129,7 +129,7 @@ export default class PatternStopMarker extends Component<Props> {
                         controlId='defaultDwellTime'>
                         <ControlLabel>Dwell time</ControlLabel>
                         <MinuteSecondInput
-                          seconds={patternStop.defaultDwellTime}
+                          seconds={patternStop.defaultDwellTime || 0}
                           onChange={this._onChangeDwellTime} />
                       </FormGroup>
                     </Col>

lib/editor/components/map/PatternStopsLayer.js

@@ -88,6 +88,7 @@ export default class PatternStopsLayer extends Component<Props> {
           const locationGroup = activePatternLocationGroups.find(l => l && l.location_group_id === locationGroupId)
           if (!stop && !location && !locationGroup) {
             console.log(stop)
+            // $FlowFixMe
             console.warn(`Could not find stop for stopId: ${stopId || locationId || locationGroupId}`, activePatternStops)
             return
           }

lib/editor/util/index.js

@@ -9,7 +9,8 @@ import type {
   Project,
   Trip,
   User,
-  ZoneInfo
+  ZoneInfo,
+  GtfsSpecTable
 } from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
@@ -195,7 +196,7 @@ export function getZones (
 
 // used to select the table from gtfs.yml to be used for
 // validating and populating fields in editor (EntityDetails)
-export function getEditorTable (component: string) {
+export function getEditorTable (component: string): GtfsSpecTable {
   const spec = getGtfsSpec()
   if (!spec) {
     throw new Error('Editor spec could not be found!')

lib/editor/util/map.js

@@ -914,7 +914,7 @@ export function generateControlPointsFromPatternStops (
   }
 }
 
-export function stopToPoint (stop: GtfsStop) {
+export function stopToPoint (stop: GtfsStop | GtfsLocation | GtfsLocationGroup) {
   return point([stop.stop_lon, stop.stop_lat])
 }
 

lib/types/index.js

@@ -714,6 +714,7 @@ export type GtfsSpecField = {
 
 export type GtfsSpecTable = {
   datatools?: boolean,
+  extraFields?: Array<GtfsSpecField>,
   fields: Array<GtfsSpecField>,
   flex?: boolean, // Denotes table as being non-csv flex table
   helpContent: string,