refactor(manager): use constants for API URL fetches

Author: landonreed

lib/alerts/actions/alerts.js

@@ -3,6 +3,7 @@ import fetch from 'isomorphic-fetch'
 import { fetchStopsAndRoutes } from '../../gtfs/actions/general'
 
 import { secureFetch } from '../../common/actions'
+import {GTFS_API_PREFIX} from '../../common/constants'
 import { getAlertsUrl, getFeedId } from '../../common/util/modules'
 import { setErrorMessage } from '../../manager/actions/status'
 import {getActiveProject} from '../../manager/selectors'
@@ -129,7 +130,9 @@ export function editAlert (alert) {
 export function fetchEntity (entity, activeProject) {
   const feed = activeProject.feedSources.find(f => getFeedId(f) === entity.entity.AgencyId)
   const feedId = getFeedId(feed)
-  const url = entity.type === 'stop' ? `/api/manager/stops/${entity.entity.StopId}?feed=${feedId}` : `/api/manager/routes/${entity.entity.RouteId}?feed=${feedId}`
+  const url = entity.type === 'stop'
+    ? `${GTFS_API_PREFIX}stops/${entity.entity.StopId}?feed=${feedId}`
+    : `${GTFS_API_PREFIX}routes/${entity.entity.RouteId}?feed=${feedId}`
   return fetch(url)
   .then((response) => {
     return response.json()

lib/common/constants/index.js

@@ -0,0 +1,9 @@
+const SECURE: string = 'secure/'
+export const API_PREFIX: string = `/api/manager/`
+export const SECURE_API_PREFIX: string = `${API_PREFIX}${SECURE}`
+// TODO: move GTFS_API_PREFIX to gtfs sub path
+// export const GTFS_API_PREFIX: string = `${API_PREFIX}gtfs/`
+export const GTFS_API_PREFIX: string = `${API_PREFIX}`
+export const GTFS_GRAPHQL_PREFIX: string = `${GTFS_API_PREFIX}graphql`
+export const EDITOR_PREFIX: string = `/api/editor/`
+export const SECURE_EDITOR_PREFIX: string = `${EDITOR_PREFIX}${SECURE}`

lib/gtfs/actions/general.js

@@ -4,6 +4,7 @@ import { clearStops } from './stops'
 import { clearPatterns } from './patterns'
 import { clearRoutes } from './routes'
 import { stopsAndRoutes, compose, patternsAndStopsForBoundingBox } from '../util/graphql'
+import {GTFS_GRAPHQL_PREFIX} from '../../common/constants'
 import { getFeedId } from '../../common/util/modules'
 import {getActiveProject} from '../../manager/selectors'
 
@@ -78,7 +79,7 @@ export function fetchStopsAndRoutes (entities, module) {
       variables: JSON.stringify({feedId, routeId, stopId})
     })
     dispatch(requestStopsAndRoutes(feedId, routeId, stopId, module))
-    return fetch(`/api/manager/graphql`, {method, body})
+    return fetch(GTFS_GRAPHQL_PREFIX, {method, body})
       .then(response => response.json())
       .then(results => dispatch(receivedStopsAndRoutes(results, module)))
   }

lib/gtfs/components/gtfsmapsearch.js

@@ -3,6 +3,7 @@ import {connect} from 'react-redux'
 import fetch from 'isomorphic-fetch'
 import { Button } from 'react-bootstrap'
 
+import {GTFS_API_PREFIX} from '../../common/constants'
 import ActiveGtfsMap from '../containers/ActiveGtfsMap'
 import GtfsSearch from './gtfssearch'
 
@@ -24,7 +25,7 @@ class GtfsMapSearch extends Component {
   }
 
   getPatterns (input) {
-    return fetch(`/api/manager/patterns?route=${input.route.route_id}&feed=${input.route.feed_id}`)
+    return fetch(`${GTFS_API_PREFIX}patterns?route=${input.route.route_id}&feed=${input.route.feed_id}`)
     .then((response) => {
       return response.json()
     })

lib/gtfs/util/graphql.js

@@ -1,8 +1,10 @@
 // @flow
 
+import {GTFS_GRAPHQL_PREFIX} from '../../common/constants'
+
 // variable names/keys must match those specified in GraphQL schema
 export function compose (query: string, variables: Object) {
-  return `/api/manager/graphql?query=${encodeURIComponent(query)}&variables=${encodeURIComponent(JSON.stringify(variables))}`
+  return `${GTFS_GRAPHQL_PREFIX}?query=${encodeURIComponent(query)}&variables=${encodeURIComponent(JSON.stringify(variables))}`
 }
 
 export const feed = `

lib/manager/actions/versions.js

@@ -4,6 +4,7 @@ import S3 from 'aws-sdk/clients/s3'
 
 import { secureFetch } from '../../common/actions'
 import { getConfigProperty } from '../../common/util/config'
+import {GTFS_GRAPHQL_PREFIX, SECURE_API_PREFIX} from '../../common/constants'
 import fileDownload from '../../common/util/file-download'
 import { setErrorMessage, startJobMonitor } from './status'
 import { fetchFeedSource } from './feeds'
@@ -59,7 +60,7 @@ export function receiveFeedVersion (feedVersion) {
 export function fetchFeedVersion (feedVersionId) {
   return function (dispatch, getState) {
     dispatch(requestingFeedVersion())
-    const url = `/api/manager/secure/feedversion/${feedVersionId}`
+    const url = `${SECURE_API_PREFIX}feedversion/${feedVersionId}`
     return dispatch(secureFetch(url))
       .then(response => response.json())
       .then(version => {
@@ -85,7 +86,7 @@ export function publishedFeedVersion (feedVersion) {
 export function publishFeedVersion (feedVersion) {
   return function (dispatch, getState) {
     dispatch(publishingFeedVersion(feedVersion))
-    const url = `/api/manager/secure/feedversion/${feedVersion.id}/publish`
+    const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}/publish`
     return dispatch(secureFetch(url, 'post'))
       .then(response => response.json())
       .then(version => {
@@ -170,7 +171,7 @@ export function deletingFeedVersion (feedVersion) {
 export function deleteFeedVersion (feedVersion, changes) {
   return function (dispatch, getState) {
     dispatch(deletingFeedVersion(feedVersion))
-    const url = '/api/manager/secure/feedversion/' + feedVersion.id
+    const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}`
     return dispatch(secureFetch(url, 'delete'))
       .then((res) => {
         // fetch feed source with versions + snapshots
@@ -243,7 +244,7 @@ export function fetchFeedVersionIsochrones (feedVersion, fromLat, fromLon, toLat
     }
     dispatch(requestingFeedVersionIsochrones(feedVersion, fromLat, fromLon, toLat, toLon, date, fromTime, toTime))
     const params = {fromLat, fromLon, toLat, toLon, date, fromTime, toTime}
-    const url = `/api/manager/secure/feedversion/${feedVersion.id}/isochrones?${qs.stringify(params)}`
+    const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}/isochrones?${qs.stringify(params)}`
     return dispatch(secureFetch(url))
       .then(res => {
         console.log(res.status)
@@ -310,7 +311,7 @@ export function creatingFeedVersionFromSnapshot () {
 export function createFeedVersionFromSnapshot (feedSource, snapshotId) {
   return function (dispatch, getState) {
     dispatch(creatingFeedVersionFromSnapshot())
-    const url = `/api/manager/secure/feedversion/fromsnapshot?feedSourceId=${feedSource.id}&snapshotId=${snapshotId}`
+    const url = `${SECURE_API_PREFIX}feedversion/fromsnapshot?feedSourceId=${feedSource.id}&snapshotId=${snapshotId}`
     return dispatch(secureFetch(url, 'post'))
       .then((res) => {
         if (res) dispatch(startJobMonitor())
@@ -327,7 +328,7 @@ export function renamingFeedVersion () {
 export function renameFeedVersion (feedVersion, name) {
   return function (dispatch, getState) {
     dispatch(renamingFeedVersion())
-    const url = `/api/manager/secure/feedversion/${feedVersion.id}/rename?name=${name}`
+    const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}/rename?name=${name}`
     return dispatch(secureFetch(url, 'put'))
       .then((res) => {
         dispatch(fetchFeedVersion(feedVersion.id))