Refs #2210: refactoring modal state and confirm modal state

6 files changed, 19 insertions, 34 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js
index 5f1655d81..de1e08686 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/ConfirmModal.js
@@ -2,7 +2,7 @@ var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
 
-const ConfirmModal = ({modal, modalActions, onModal}) => (
+const ConfirmModal = ({modal, onModal}) => (
   <div className={ 'modal fade ' + (modal.confirm ? 'in' : '') } id='ConfirmModal'>
     <div className='modal-dialog'>
       <div className='modal-content'>
@@ -14,7 +14,7 @@ const ConfirmModal = ({modal, modalActions, onModal}) => (
             className='btn btn-default'
             data-dismiss='modal'
             type='button'
-            onClick= {() => {onModal(modalActions.cancel)}}
+            onClick= {() => {onModal(modal.confirmModal.confirmActions.cancel)}}
             >
             Annuler
           </button>
@@ -22,7 +22,7 @@ const ConfirmModal = ({modal, modalActions, onModal}) => (
             className='btn btn-danger'
             data-dismiss='modal'
             type='button'
-            onClick = {() => {onModal(modalActions.accept)}}
+            onClick = {() => {onModal(modal.confirmModal.confirmActions.accept)}}
             >
             Valider
           </button>
@@ -34,7 +34,6 @@ const ConfirmModal = ({modal, modalActions, onModal}) => (
 
 ConfirmModal.propTypes = {
   modal: PropTypes.object.isRequired,
-  modalActions: PropTypes.object.isRequired,
   onModal: PropTypes.func.isRequired
 }
 
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/ConfirmModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/ConfirmModal.js
index 47021cd22..37f39176f 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/ConfirmModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/ConfirmModal.js
@@ -4,8 +4,7 @@ var ConfirmModal = require('../components/ConfirmModal')
 
 const mapStateToProps = (state) => {
   return {
-    modal: state.modal,
-    modalActions: state.confirmModal.confirmActions
+    modal: state.modal
   }
 }
 
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/index.js
index a295add0b..a2d3bfe29 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/index.js
@@ -20,10 +20,7 @@ var initialState = {
     create: false,
     confirm: false,
     modalProps: {},
-    confirmActions: {
-      accept : {},
-      cancel : {}
-    }
+    confirmModal: {}
   }
 }
 // const loggerMiddleware = createLogger()
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/confirmModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/confirmModal.js
deleted file mode 100644
index 414da49fe..000000000
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/confirmModal.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const confirmModal = (state = {}, action) => {
-  switch (action.type) {
-    case 'OPEN_CONFIRM_MODAL':
-      let modal = Object.assign( {}, state.modal,
-        {
-          confirmActions : {
-            accept: action.accept,
-            cancel: action.cancel
-          },
-          confirm: true
-        }
-      )
-      return Object.assign({}, state, modal: modal)
-    default:
-      return state
-  }
-}
-
-module.exports = confirmModal
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js
index a9e5feea9..71ff8b6f5 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js
@@ -3,14 +3,12 @@ var journeyPatterns = require('./journeyPatterns')
 var pagination = require('./pagination')
 var totalCount = require('./totalCount')
 var modal = require('./modal')
-var confirmModal = require('./confirmModal')
 
 const journeyPatternsApp = combineReducers({
   journeyPatterns,
   pagination,
   totalCount,
-  modal,
-  confirmModal
+  modal
 })
 
 module.exports = journeyPatternsApp
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 16f89be3e..5f2d53529 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
@@ -1,5 +1,15 @@
 const modal = (state = {}, action) => {
   switch (action.type) {
+    case 'OPEN_CONFIRM_MODAL':
+      return Object.assign({}, state, {
+        confirm: true,
+        confirmModal: {
+          confirmActions: {
+            accept: action.accept,
+            cancel: action.cancel
+          }
+        }
+      })
     case 'EDIT_JOURNEYPATTERN_MODAL':
       return {
         edit: true,
@@ -16,13 +26,14 @@ const modal = (state = {}, action) => {
         modalProps: { index: action.index }
       }
     case 'DELETE_JOURNEYPATTERN':
-      return Object.assign({}, state, { edit: false, create: false })
+      return Object.assign({}, state, { edit: false, create: false, confirm: false })
     case 'SAVE_MODAL':
-      return Object.assign({}, state, { edit: false, create: false })
+      return Object.assign({}, state, { edit: false, create: false, confirm: false })
     case 'CLOSE_MODAL':
       return {
         edit: false,
         create: false,
+        confirm: false,
         modalProps: {}
       }
     default: