fix(gtfs-plus-actions): fix version fetch after publish

lib/gtfsplus/actions/gtfsplus.js

@@ -3,7 +3,8 @@ import fetch from 'isomorphic-fetch'
 
 import { secureFetch } from '../../common/actions'
 import { getConfigProperty } from '../../common/util/config'
-import { fetchFeedVersions } from '../../manager/actions/feeds'
+// import {stopsAndRoutes, compose} from '../../gtfs/util/graphql'
+import { fetchFeedVersions } from '../../manager/actions/versions'
 import { getFeedId } from '../../common/util/modules'
 
 // EDIT ACTIVE GTFS+ ACTIONS
@@ -130,9 +131,7 @@ export function validateGtfsPlusFeed (feedVersionId) {
     const url = `/api/manager/secure/gtfsplus/${feedVersionId}/validation`
     return dispatch(secureFetch(url))
       .then(res => res.json())
-      .then(validationIssues => {
-        dispatch(receiveGtfsPlusValidation(validationIssues))
-      })
+      .then(validationIssues => dispatch(receiveGtfsPlusValidation(validationIssues)))
   }
 }
 
@@ -215,15 +214,19 @@ export function loadGtfsEntities (tableId, rows, feedSource) {
         }
       }
     }
+    // TODO: replace multiple fetches with GraphQL
+    // fetch(compose(stopsAndRoutes(feedId, routesToLoad, stopsToLoad), {feedId, routeId: routesToLoad, stopId: stopsToLoad}))
+    //   .then((response) => response.json())
+    //   .then(results => {
+    //     return dispatch(receivedStopsAndRoutes(results))
+    //   })
 
     if (routesToLoad.length === 0 && stopsToLoad.length === 0) return
     const feedId = getFeedId(feedSource)
     var loadRoutes = Promise.all(routesToLoad.map(routeId => {
       const url = `/api/manager/routes/${routeId}?feed=${feedId}`
       return fetch(url)
-      .then((response) => {
-        return response.json()
-      })
+      .then((response) => response.json())
     }))
 
     var loadStops = Promise.all(stopsToLoad.map(stopId => {
@@ -240,6 +243,14 @@ export function loadGtfsEntities (tableId, rows, feedSource) {
   }
 }
 
+// const receivedStopsAndRoutes = (results, module) => {
+//   return {
+//     type: 'RECEIVED_GTFSPLUS_STOPS_AND_ROUTES',
+//     results,
+//     module
+//   }
+// }
+
 // PUBLISH ACTIONS
 
 export function publishingGtfsPlusFeed () {
@@ -253,9 +264,7 @@ export function publishGtfsPlusFeed (feedVersion) {
     dispatch(publishingGtfsPlusFeed())
     const url = `/api/manager/secure/gtfsplus/${feedVersion.id}/publish`
     return dispatch(secureFetch(url, 'post'))
-      .then((res) => {
-        console.log('published done')
-        return dispatch(fetchFeedVersions(feedVersion.feedSource))
-      })
+      .then((res) => res.json())
+      .then(json => dispatch(fetchFeedVersions(feedVersion.feedSource)))
   }
 }