modal code gardening

6 files changed, 13 insertions, 30 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 2e57b33f9..a9e7c41bd 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -24,8 +24,8 @@ const actions = {
     id : e.currentTarget.id,
     index
   }),
-  openUpdateModalOpen : (index, journeyPattern) => ({
-    type : 'UPDATE_JOURNEYPATTERN_MODAL',
+  openEditModal : (index, journeyPattern) => ({
+    type : 'EDIT_JOURNEYPATTERN_MODAL',
     index,
     journeyPattern
   }),
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index 1e930ee5d..209af168f 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -15,7 +15,7 @@ const JourneyPattern = (props) => {
       </div>
 
       <div className='clearfix' style={{display: 'inline-block', verticalAlign: 'top', width: '20%'}}>
-        <button className={(props.value.deletable ? 'disabled' : '') + ' btn btn-xs btn-danger pull-right'} onClick={props.onUpdateModalOpen} data-toggle='modal' data-target='#JourneyPatternModal'>
+        <button className={(props.value.deletable ? 'disabled' : '') + ' btn btn-xs btn-danger pull-right'} onClick={props.onOpenEditModal} data-toggle='modal' data-target='#JourneyPatternModal'>
           <span className='fa fa-pencil'></span>
         </button>
       </div>
@@ -49,7 +49,7 @@ JourneyPattern.propTypes = {
   value: PropTypes.object,
   index: PropTypes.number,
   onCheckboxChange: PropTypes.func.isRequired,
-  onUpdateModalOpen: PropTypes.func.isRequired
+  onOpenEditModal: PropTypes.func.isRequired
 }
 
 module.exports = JourneyPattern
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 4a74f7d19..70bc784c4 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -21,7 +21,7 @@ class JourneyPatterns extends Component{
             value={ journeyPattern }
             key={ index }
             onCheckboxChange= {(e) => this.props.onCheckboxChange(e, index)}
-            onUpdateModalOpen= {() => this.props.onUpdateModalOpen(index, journeyPattern)}
+            onOpenEditModal= {() => this.props.onOpenEditModal(index, journeyPattern)}
           />
         )}
       </div>
@@ -33,7 +33,7 @@ JourneyPatterns.propTypes = {
   journeyPatterns: PropTypes.array.isRequired,
   onCheckboxChange: PropTypes.func.isRequired,
   onLoadFirstPage: PropTypes.func.isRequired,
-  onUpdateModalOpen: PropTypes.func.isRequired
+  onOpenEditModal: PropTypes.func.isRequired
 }
 
 module.exports = JourneyPatterns
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
index 17b5b0506..cafde555c 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/AddJourneyPattern.js
@@ -7,7 +7,10 @@ let AddJourneyPattern = ({ dispatch }) => {
     <form onSubmit={e => {
       e.preventDefault()
     }}>
-      <button type="submit" className="btn btn-primary btn-sm pull-right">
+      <button
+        type='button'
+        className="btn btn-primary btn-sm pull-right"
+      >
         <span className="fa fa-plus"></span> Ajouter une mission
       </button>
     </form>
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js b/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js
index df1df9933..73dc6a1c7 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/JourneyPatternList.js
@@ -16,8 +16,8 @@ const mapDispatchToProps = (dispatch) => {
     onCheckboxChange: (e, index) =>{
       dispatch(actions.updateCheckboxValue(e, index))
     },
-    onUpdateModalOpen: (index, journeyPattern) =>{
-      dispatch(actions.openUpdateModalOpen(index, journeyPattern))
+    onOpenEditModal: (index, journeyPattern) =>{
+      dispatch(actions.openEditModal(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 87efd4cfe..c6156c72c 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
@@ -1,19 +1,6 @@
-// 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) {
-    case 'UPDATE_JOURNEYPATTERN_MODAL':
+    case 'EDIT_JOURNEYPATTERN_MODAL':
       return {
         open: true,
         modalProps: {
@@ -25,13 +12,6 @@ const modal = (state = {}, action) => {
       return Object.assign({}, state, { open: false })
     case 'SAVE_MODAL':
       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,