Refs #2209: dispatch modal changes on journey pattern

5 files changed, 40 insertions, 28 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 95577994c..2e57b33f9 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -37,9 +37,10 @@ const actions = {
   closeModal : () => ({
     type : 'CLOSE_MODAL'
   }),
-  saveModal : (data) => ({
+  saveModal : (index, data) => ({
     type: 'SAVE_MODAL',
-    data
+    data,
+    index
   }),
   savePage : (dispatch, currentPage) => ({
     type: 'SAVE_PAGE',
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
index 1d6c798bc..8e0f1bfad 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
@@ -8,7 +8,7 @@ class ModalComponent extends Component {
   }
   handleSubmit(e) {
     e.preventDefault()
-    this.props.saveModal(this.refs)
+    this.props.saveModal(this.props.modal.modalProps.index, this.refs)
   }
 
   render() {
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/Modal.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/Modal.js
index 146d33b4a..7c72afccd 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/Modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/Modal.js
@@ -17,8 +17,8 @@ const mapDispatchToProps = (dispatch) => {
     onDeleteJourneyPattern: (index, journeyPattern) =>{
       dispatch(actions.deleteJourneyPattern(index, journeyPattern))
     },
-    saveModal: (data) =>{
-      dispatch(actions.saveModal(data))
+    saveModal: (index, data) =>{
+      dispatch(actions.saveModal(index, data))
     }
   }
 }
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js
index 8885090a7..737c90307 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js
@@ -42,9 +42,21 @@ const journeyPatterns = (state = {}, action) => {
       })
     case 'DELETE_JOURNEYPATTERN':
       return state.map((j, i) =>{
-        if( i == action.index){
+        if(i == action.index) {
           return Object.assign({}, j, {deletable: true})
-        }else{
+        } else {
+          return j
+        }
+      })
+    case 'SAVE_MODAL':
+      return state.map((j, i) =>{
+        if(i == action.index) {
+          return Object.assign({}, j, {
+            name: action.data.name.value,
+            published_name: action.data.published_name.value,
+            registration_number: action.data.registration_number.value
+          })
+        } else {
           return j
         }
       })
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
index a54b9a66e..87efd4cfe 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
@@ -1,17 +1,15 @@
-const updatedJourneyPattern = (state = {}, action) => {
-  switch (action.type) {
-    case 'DELETE_JOURNEYPATTERN_MODAL':
-      return Object.assign({}, state, { deletable: true })
-    case 'SAVE_MODAL':
-      return Object.assign({}, state, {
-        name: action.data.name.value,
-        published_name: action.data.published_name.value,
-        registration_number: action.data.registration_number.value
-      })
-    default:
-      return state
-  }
-}
+// const updatedJourneyPattern = (state = {}, action) => {
+//   switch (action.type) {
+//     case 'SAVE_MODAL':
+//       return Object.assign({}, state, {
+//         name: action.data.name.value,
+//         published_name: action.data.published_name.value,
+//         registration_number: action.data.registration_number.value
+//       })
+//     default:
+//       return state
+//   }
+// }
 
 const modal = (state = {}, action) => {
   switch (action.type) {
@@ -26,13 +24,14 @@ const modal = (state = {}, action) => {
     case 'DELETE_JOURNEYPATTERN':
       return Object.assign({}, state, { open: false })
     case 'SAVE_MODAL':
-      return Object.assign({}, state, {
-        open: false,
-        modalProps: {
-          index: state.modalProps.index,
-          journeyPattern: updatedJourneyPattern(state.modalProps.journeyPattern, action)
-        }
-      })
+      return Object.assign({}, state, { open: false })
+      // return Object.assign({}, state, {
+      //   open: false,
+      //   modalProps: {
+      //     index: state.modalProps.index,
+      //     journeyPattern: updatedJourneyPattern(state.modalProps.journeyPattern, action)
+      //   }
+      // })
     case 'CLOSE_MODAL':
       return {
         open: false,