Update JS timetable specs

7 files changed, 10 insertions, 10 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
index 8dae4e18b..3577df2b6 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -144,6 +144,7 @@ const actions = {
               dispatch(actions.updateTotalCount(window.currentItemsLength - json.length))
             }
             window.currentItemsLength = json.length
+            dispatch(actions.exitEditMode())
             dispatch(actions.receiveJourneyPatterns(json))
           }
         }
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
index 8c01cca57..6506b706c 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -96,7 +96,7 @@ class JourneyPatterns extends Component{
               <div className="alert alert-danger mt-sm">
                 <strong>Erreur : </strong>
                 {this.props.journeyPatterns.map((jp, index) =>
-                  jp.errors.map((err, i) => {
+                  jp.errors && jp.errors.map((err, i) => {
                     return (
                       <ul key={i}>
                         <li>{err}</li>
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
index 0bbf0edfb..434264fea 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
@@ -19,7 +19,6 @@ const mapDispatchToProps = (dispatch) => {
     },
     onSubmitJourneyPattern: (next, state) => {
       actions.submitJourneyPattern(dispatch, state, next)
-      dispatch(actions.exitEditMode())
     }
   }
 }
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index 019ca59d0..951451a3b 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -377,6 +377,7 @@ const actions = {
               dispatch(actions.updateTotalCount(window.currentItemsLength - json.length))
             }
             window.currentItemsLength = json.length
+            dispatch(actions.exitEditMode())
             dispatch(actions.receiveVehicleJourneys(json))
           }
         }
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
index 68f738540..8f3f91b25 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
@@ -97,7 +97,7 @@ class VehicleJourneys extends Component{
               <div className="alert alert-danger mt-sm">
                 <strong>Erreur : </strong>
                 {this.props.vehicleJourneys.map((vj, index) =>
-                  vj.errors.map((err, i) => {
+                  vj.errors && vj.errors.map((err, i) => {
                     return (
                       <ul key={i}>
                         <li>{err}</li>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js
index 4fbd6a5a6..c1ce90d38 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/SaveVehicleJourneys.js
@@ -20,7 +20,6 @@ const mapDispatchToProps = (dispatch) => {
     },
     onSubmitVehicleJourneys: (next, state) => {
       actions.submitVehicleJourneys(dispatch, state, next)
-      dispatch(actions.exitEditMode())
     }
   }
 }
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index 53bbcf952..7872899dc 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
@@ -8,10 +8,10 @@ var actions = require("./actions")
 var enableBatching = require('./batch').enableBatching
 
 // logger, DO NOT REMOVE
-// var applyMiddleware = require('redux').applyMiddleware
-// var createLogger = require('redux-logger')
-// var thunkMiddleware = require('redux-thunk').default
-// var promise = require('redux-promise')
+var applyMiddleware = require('redux').applyMiddleware
+var createLogger = require('redux-logger')
+var thunkMiddleware = require('redux-thunk').default
+var promise = require('redux-promise')
 
 var selectedJP = []
 
@@ -86,12 +86,12 @@ if (window.jpOrigin){
   initialState.filters.queryString = actions.encodeParams(params)
 }
 
-// const loggerMiddleware = createLogger()
+const loggerMiddleware = createLogger()
 
 let store = createStore(
   enableBatching(vehicleJourneysApp),
   initialState,
-  // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
+  applyMiddleware(thunkMiddleware, promise, loggerMiddleware)
 )
 
 render(