fix addjourneypattern condition, add isfetching behaviours

4 files changed, 15 insertions, 1 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
index b64ee5f77..17e3cfbca 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js
@@ -16,7 +16,10 @@ class CreateModal extends Component {
   }
 
   render() {
-    if(status.fetchSuccess == true) {
+    if(this.props.status.isFetching == true) {
+      return false
+    }
+    if(this.props.status.fetchSuccess == true) {
       return (
         <div className='pull-right'>
           <button
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 393919755..65dde81c4 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -14,6 +14,11 @@ class JourneyPatterns extends Component{
   render() {
     return (
       <div className='list-group'>
+        {(this.props.status.isFetching == true) && (
+          <div className="alert alert-info">
+            Is fetching...
+          </div>
+        )}
         {(this.props.status.fetchSuccess == false) && (
           <div className="alert alert-danger">
             <strong>Erreur : </strong>
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js
index 4d58680cd..a5d6a5a9f 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/Navigate.js
@@ -7,6 +7,9 @@ let Navigate = ({ dispatch, journeyPatterns, pagination, status }) => {
   let firstPage = 1
   let lastPage = Math.ceil(pagination.totalCount / window.journeyPatternsPerPage)
 
+  if(status.isFetching == true) {
+    return false
+  }
   if(status.fetchSuccess == true) {
     return (
       <form className='btn-group btn-group-sm' onSubmit={e => {
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 23198d651..35626d626 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/containers/SaveJourneyPattern.js
@@ -3,6 +3,9 @@ var connect = require('react-redux').connect
 var actions = require('../actions')
 
 let SaveJourneyPattern = ({ dispatch, journeyPatterns, page, status }) => {
+  if(status.isFetching == true) {
+    return false
+  }
   if(status.fetchSuccess == true) {
     return (
       <form className='clearfix' onSubmit={e => {e.preventDefault()}}>