fix(ActiveGtfsPlusEditor): Pass feed version summary to child components.

Author: binh-dam-ibigroup

lib/gtfsplus/actions/gtfsplus.js

@@ -10,9 +10,9 @@ import {stopsAndRoutes} from '../../gtfs/util/graphql'
 import {getHeaders} from '../../common/util/util'
 import {VISIBILITY} from '../components/GtfsPlusTable'
 import {startJobMonitor} from '../../manager/actions/status'
-
 import type {
   FeedVersion,
+  FeedVersionSummary,
   GtfsRoute,
   GtfsStop,
   GtfsPlusValidation,
@@ -205,7 +205,7 @@ export function uploadGtfsPlusFeed (feedVersionId: string, file: File) {
 export function loadGtfsEntities (
   tableId: string,
   rows: Array<GTFSPlusEntity>,
-  feedVersion: FeedVersion,
+  feedVersionSummary: FeedVersionSummary,
   validation: GtfsPlusValidation
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
@@ -227,7 +227,7 @@ export function loadGtfsEntities (
         return row
       })
       : rows
-    const {namespace} = feedVersion
+    const {namespace} = feedVersionSummary
     const {routesToLoad, stopsToLoad} = lookupMissingEntities(filteredRows, getState().gtfsplus.gtfsEntityLookup)
     if (routesToLoad.length === 0 && stopsToLoad.length === 0) {
       return

lib/gtfsplus/components/GtfsPlusEditor.js

@@ -8,14 +8,14 @@ import {Link} from 'react-router'
 import ManagerPage from '../../common/components/ManagerPage'
 import OptionButton from '../../common/components/OptionButton'
 import * as gtfsPlusActions from '../actions/gtfsplus'
-import GtfsPlusTable from './GtfsPlusTable'
 import {getGtfsPlusSpec} from '../../common/util/config'
 import * as feedsActions from '../../manager/actions/feeds'
-
 import type {Props as ContainerProps} from '../containers/ActiveGtfsPlusEditor'
-import type {Feed, FeedVersion, GtfsPlusValidation, Project} from '../../types'
+import type {Feed, FeedVersionSummary, GtfsPlusValidation, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
+import GtfsPlusTable from './GtfsPlusTable'
+
 export type Props = ContainerProps & {
   activeTableId: string,
   addGtfsPlusRow: typeof gtfsPlusActions.addGtfsPlusRow,
@@ -24,8 +24,8 @@ export type Props = ContainerProps & {
   downloadGtfsPlusFeed: typeof gtfsPlusActions.downloadGtfsPlusFeed,
   feedSource: Feed,
   feedSourceId: string,
-  feedVersion: FeedVersion,
   feedVersionId: string,
+  feedVersionSummary: FeedVersionSummary,
   fetchFeedSourceAndProject: typeof feedsActions.fetchFeedSourceAndProject,
   gtfsEntityLookup: Object,
   loadGtfsEntities: typeof gtfsPlusActions.loadGtfsEntities,
@@ -100,8 +100,8 @@ export default class GtfsPlusEditor extends Component<Props> {
   _getGtfsEntity = (type: string, id: string) => this.props.gtfsEntityLookup[`${type}_${id}`]
 
   _newRowsDisplayed = (rows: Array<any>) => {
-    const {activeTableId, feedVersion, loadGtfsEntities, validation} = this.props
-    if (feedVersion) loadGtfsEntities(activeTableId, rows, feedVersion, validation)
+    const {activeTableId, feedVersionSummary, loadGtfsEntities, validation} = this.props
+    if (feedVersionSummary) loadGtfsEntities(activeTableId, rows, feedVersionSummary, validation)
   }
 
   _selectTable = (activeTableId: string) => this.props.setActiveTable({activeTableId})
@@ -127,7 +127,7 @@ export default class GtfsPlusEditor extends Component<Props> {
     const {
       activeTableId,
       feedSource,
-      feedVersion,
+      feedVersionSummary,
       project,
       tableData,
       user,
@@ -157,7 +157,7 @@ export default class GtfsPlusEditor extends Component<Props> {
                 <li><Link to='/'>Explore</Link></li>
                 <li><Link to='/project'>Projects</Link></li>
                 <li><Link to={`/project/${project.id}`}>{project.name}</Link></li>
-                <li><Link to={`/feed/${feedSource.id}/version/${feedVersion.version}/gtfsplus`}>{feedSource.name}</Link></li>
+                <li><Link to={`/feed/${feedSource.id}/version/${feedVersionSummary.version}/gtfsplus`}>{feedSource.name}</Link></li>
                 <li className='active'>Edit GTFS+</li>
               </ul>
             </Col>

lib/gtfsplus/components/GtfsPlusField.js

@@ -42,7 +42,8 @@ export default class GtfsPlusField extends Component<Props> {
   }
 
   render () {
-    const {currentValue, data: rowData, feedVersion, field, getGtfsEntity} = this.props
+    const {currentValue, data: rowData, feedVersionSummary, field, getGtfsEntity} = this.props
+    const namespace = feedVersionSummary && feedVersionSummary.namespace
     switch (field.inputType) {
       case 'TEXT':
       case 'GTFS_TRIP':
@@ -108,7 +109,7 @@ export default class GtfsPlusField extends Component<Props> {
         return (
           <GtfsSearch
             feeds={[]}
-            namespace={feedVersion && feedVersion.namespace}
+            namespace={namespace}
             limit={100}
             entities={['routes']}
             minimumInput={1}
@@ -124,7 +125,7 @@ export default class GtfsPlusField extends Component<Props> {
         return (
           <GtfsSearch
             feeds={[]}
-            namespace={feedVersion && feedVersion.namespace}
+            namespace={namespace}
             limit={100}
             entities={['stops']}
             clearable={false}

lib/gtfsplus/containers/ActiveGtfsPlusEditor.js

@@ -17,7 +17,6 @@ import {
   setVisibilityFilter
 } from '../actions/gtfsplus'
 import {getValidationIssuesForTable, getVisibleRows, getFilteredPageCount} from '../selectors'
-
 import type {AppState, RouterProps} from '../../types/reducers'
 
 export type Props = RouterProps
@@ -43,16 +42,16 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
   const feedSource = project && project.feedSources
     ? project.feedSources.find(fs => fs.id === feedSourceId)
     : null
-  const feedVersion = feedSource && feedSource.feedVersions
-    ? feedSource.feedVersions.find(v => v.id === feedVersionId)
+  const feedVersionSummary = feedSource && feedSource.feedVersionSummaries
+    ? feedSource.feedVersionSummaries.find(v => v.id === feedVersionId)
     : null
   return {
     activeTableId,
     currentPage,
     feedSource,
     feedSourceId,
-    feedVersion,
     feedVersionId,
+    feedVersionSummary,
     gtfsEntityLookup,
     pageCount: getFilteredPageCount(state),
     project,