Create project and feed refactor

i18n/english.yml

@@ -230,7 +230,7 @@ components:
           title: Real-time updaters
         walkSpeed: Walk Speed
       title: Deployment
-    general:
+    fields:
       location:
         boundingBox: 'Bounding box (W,S,E,N)'
         defaultLanguage: Default language

i18n/espanol.yml

@@ -223,7 +223,7 @@ components:
           title: Real-time updaters
         walkSpeed: Walk Speed
       title: Deployment
-    general:
+    fields:
       location:
         boundingBox: 'Bounding box (W,S,E,N)'
         defaultLanguage: Default language

i18n/francais.yml

@@ -223,7 +223,7 @@ components:
           title: Real-time updaters
         walkSpeed: Walk Speed
       title: Deployment
-    general:
+    fields:
       location:
         boundingBox: 'Bounding box (W,S,E,N)'
         defaultLanguage: Default language

lib/common/containers/App.js

@@ -1,26 +1,27 @@
 import React, { Component, PropTypes } from 'react'
 import { Router, Route, browserHistory } from 'react-router'
 
+import ActiveUserAdmin from '../../admin/containers/ActiveUserAdmin'
+import MainAlertsViewer from '../../alerts/containers/MainAlertsViewer'
+import ActiveAlertEditor from '../../alerts/containers/ActiveAlertEditor'
+import PageNotFound from '../components/PageNotFound'
+import ActiveGtfsEditor from '../../editor/containers/ActiveGtfsEditor'
 import { checkExistingLogin, login } from '../../manager/actions/user'
-import { isModuleEnabled } from '../util/config'
-
+import ActiveDeploymentViewer from '../../manager/containers/ActiveDeploymentViewer'
 import ActiveFeedSourceViewer from '../../manager/containers/ActiveFeedSourceViewer'
-import ActiveProjectViewer from '../../manager/containers/ActiveProjectViewer'
 import ActiveProjectsList from '../../manager/containers/ActiveProjectsList'
+import ActiveProjectViewer from '../../manager/containers/ActiveProjectViewer'
+import ActiveUserHomePage from '../../manager/containers/ActiveUserHomePage'
+import CreateProject from '../../manager/containers/CreateProject'
+import CreateFeedSource from '../../manager/containers/CreateFeedSource'
 import ActivePublicFeedSourceViewer from '../../public/containers/ActivePublicFeedSourceViewer'
-import ActiveDeploymentViewer from '../../manager/containers/ActiveDeploymentViewer'
 import ActivePublicFeedsViewer from '../../public/containers/ActivePublicFeedsViewer'
 import ActiveSignupPage from '../../public/containers/ActiveSignupPage'
-import ActiveUserHomePage from '../../manager/containers/ActiveUserHomePage'
 import ActiveUserAccount from '../../public/containers/ActiveUserAccount'
-import ActiveUserAdmin from '../../admin/containers/ActiveUserAdmin'
-import MainAlertsViewer from '../../alerts/containers/MainAlertsViewer'
-import ActiveAlertEditor from '../../alerts/containers/ActiveAlertEditor'
-import MainSignsViewer from '../../signs/containers/MainSignsViewer'
-import ActiveSignEditor from '../../signs/containers/ActiveSignEditor'
-import PageNotFound from '../components/PageNotFound'
 import ActiveGtfsPlusEditor from '../../gtfsplus/containers/ActiveGtfsPlusEditor'
-import ActiveGtfsEditor from '../../editor/containers/ActiveGtfsEditor'
+import ActiveSignEditor from '../../signs/containers/ActiveSignEditor'
+import MainSignsViewer from '../../signs/containers/MainSignsViewer'
+import {isModuleEnabled} from '../util/config'
 
 export default class App extends Component {
   static propTypes = {
@@ -85,6 +86,12 @@ export default class App extends Component {
       {path: '/', component: ActivePublicFeedsViewer, onEnter: this.checkLogin},
       {path: '/public/feed/:feedSourceId(/version/:feedVersionIndex)', component: ActivePublicFeedSourceViewer, onEnter: this.checkLogin},
       {path: '/project', component: ActiveProjectsList, onEnter: this.requireAuth},
+      {path: '/project/new', component: CreateProject, onEnter: this.requireAuth},
+      {
+        path: '/project/:projectId/newFeedSource',
+        component: CreateFeedSource,
+        onEnter: this.requireAuth
+      },
       {path: '/project/:projectId(/:subpage)(/:subsubpage)', component: ActiveProjectViewer, onEnter: this.requireAuth},
       {
         path: '/feed/:feedSourceId/edit(/:activeComponent)(/:activeEntityId)(/:subComponent)(/:subEntityId)(/:subSubComponent)(/:activeSubSubEntity)',

lib/common/util/config.js

@@ -36,7 +36,7 @@ export function isExtensionEnabled (extensionName: string): boolean {
   )
 }
 
-export function initializeConfig () {
+function initializeConfig () {
   if (!process.env.SETTINGS) {
     throw new Error('SETTINGS environment variable not set')
   }
@@ -70,3 +70,8 @@ export function initializeConfig () {
   // console.log('config', config)
   window.DT_CONFIG = config
 }
+
+if (process.env.NODE_ENV !== 'test') {
+  // skip this, cause there's an error in jest
+  initializeConfig()
+}

lib/main.js

@@ -2,7 +2,6 @@ import 'babel-polyfill'
 import mount from '@conveyal/woonerf/mount'
 
 import App from './common/containers/App'
-import {initializeConfig} from './common/util/config'
 import * as managerReducers from './manager/reducers'
 import admin from './admin/reducers'
 import alerts from './alerts/reducers'
@@ -12,8 +11,6 @@ import * as gtfsPlusReducers from './gtfsplus/reducers'
 import editor from './editor/reducers'
 import gtfs from './gtfs/reducers'
 
-initializeConfig()
-
 mount({
   app: App,
   reducers: {

lib/manager/actions/feeds.js

@@ -1,3 +1,5 @@
+import { browserHistory } from 'react-router'
+
 import { secureFetch } from '../../common/actions'
 import { fetchProject, fetchProjectWithFeeds } from './projects'
 import { setErrorMessage, startJobMonitor } from './status'
@@ -50,26 +52,22 @@ function receivePublicFeeds (feeds) {
   }
 }
 
-export function createFeedSource (projectId) {
-  return {
-    type: 'CREATE_FEEDSOURCE',
-    projectId
-  }
-}
-
 export function savingFeedSource () {
   return {
     type: 'SAVING_FEEDSOURCE'
   }
 }
 
-export function saveFeedSource (props) {
+export function createFeedSource (feed) {
   return function (dispatch, getState) {
     dispatch(savingFeedSource())
     const url = '/api/manager/secure/feedsource'
-    return dispatch(secureFetch(url, 'post', props))
-      .then((res) => {
-        return dispatch(fetchProjectWithFeeds(props.projectId))
+    return dispatch(secureFetch(url, 'post', feed))
+      .then((res) => res.json())
+      .then((createdFeed) => {
+        return dispatch(fetchProjectWithFeeds(feed.projectId)).then(() => {
+          browserHistory.push(`/feed/${createdFeed.id}`)
+        })
       })
   }
 }

lib/manager/actions/projects.js

@@ -1,3 +1,5 @@
+import { browserHistory } from 'react-router'
+
 import { secureFetch } from '../../common/actions'
 import { getConfigProperty } from '../../common/util/config'
 import { fetchProjectFeeds } from './feeds'
@@ -177,13 +179,6 @@ export function deployPublic (project) {
   }
 }
 
-export function createProject (project) {
-  return {
-    type: 'CREATE_PROJECT',
-    project
-  }
-}
-
 export function requestingSync () {
   return {
     type: 'REQUESTING_SYNC'
@@ -255,13 +250,20 @@ function savingProject (props) {
   }
 }
 
-export function saveProject (props) {
+export function createProject (project) {
   return function (dispatch, getState) {
-    dispatch(savingProject(props))
+    dispatch(savingProject(project))
     const url = '/api/manager/secure/project'
-    return dispatch(secureFetch(url, 'post', props))
+    let newProjectId
+    return dispatch(secureFetch(url, 'post', project))
       .then((res) => res.json())
-      .then((json) => dispatch(fetchProjects()))
+      .then((json) => {
+        newProjectId = json.id
+        return dispatch(fetchProjects())
+      })
+      .then(() => {
+        browserHistory.push(`/project/${newProjectId}`)
+      })
   }
 }