Refs #2208: adding delete journey pattern to modal on jp collection

4 files changed, 34 insertions, 3 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 0d1c97fd7..2561a6add 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -29,6 +29,11 @@ const actions = {
     index,
     journeyPattern
   }),
+  deleteJourneyPattern : (index, journeyPattern) => ({
+    type : 'DELETE_JOURNEYPATTERN_MODAL',
+    index,
+    journeyPattern
+  }),
   closeModal : () => ({
     type : 'CLOSE_MODAL'
   }),
@@ -51,7 +56,7 @@ const actions = {
     fetch(req)
       .then(response => response.json())
       .then((json) => {
-        console.log('ton papa')
+        console.log('request for submit')
         // dispatch(actions.receiveJourneyPatterns(journeyPatterns))
       })
   },
@@ -100,7 +105,8 @@ const actions = {
             object_id: val.object_id,
             published_name: val.published_name,
             registration_number: val.registration_number,
-            stop_points: val.route_short_description.stop_points
+            stop_points: val.route_short_description.stop_points,
+            deletable: false
           })
         }
         dispatch(actions.receiveJourneyPatterns(journeyPatterns))
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 4baefbda2..869d14f1e 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
@@ -28,12 +28,19 @@ const ModalComponent = (props) => {
                 <li>
                   <a
                     href='#'
+                    onClick={() => props.onDeleteJourneyPattern(props.modal.modalProps.index, props.modal.modalProps.journeyPattern)}
                   >
                     Supprimer la mission
                   </a>
                 </li>
               </ul>
             </div>
+            {props.modal.open && (
+              props.modal.modalProps.journeyPattern.deletable ?
+              <div className='alert alert-danger' style={{clear: 'both', marginBottom: 0}}>La mission a été supprimée. Cette action sera effective après validation.</div>
+              :
+              ''
+            )}
           </div>
           <div className='modal-body'>
             {props.modal.open && (
@@ -99,7 +106,8 @@ const ModalComponent = (props) => {
 ModalComponent.propTypes = {
   index: PropTypes.number,
   modal: PropTypes.object,
-  onModalClose: PropTypes.func.isRequired
+  onModalClose: PropTypes.func.isRequired,
+  onDeleteJourneyPattern: PropTypes.func.isRequired
 }
 
 module.exports = ModalComponent
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 347333bfd..06f4d0e13 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/Modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/Modal.js
@@ -12,6 +12,9 @@ const mapDispatchToProps = (dispatch) => {
   return {
     onModalClose: () =>{
       dispatch(actions.closeModal())
+    },
+    onDeleteJourneyPattern: (index, journeyPattern) =>{
+      dispatch(actions.deleteJourneyPattern(index, journeyPattern))
     }
   }
 }
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 8d25af6d1..1ee7f64c0 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
@@ -8,6 +8,20 @@ const modal = (state = {}, action) => {
           journeyPattern: action.journeyPattern
         }
       }
+    case 'DELETE_JOURNEYPATTERN_MODAL':
+      return Object.assign({}, state, {
+        modalProps: {
+          index: action.index,
+          journeyPattern: {
+            name: action.journeyPattern.name,
+            object_id: action.journeyPattern.object_id,
+            published_name: action.journeyPattern.published_name,
+            registration_number: action.journeyPattern.registration_number,
+            stop_points: action.journeyPattern.stop_points,
+            deletable: true
+          }
+        }
+      })
     case 'CLOSE_MODAL':
       return {
         open: false,