update isFetching loader integration

1 files changed, 26 insertions, 23 deletions

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 31646d76b..9b13781f8 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -12,29 +12,32 @@ class JourneyPatterns extends Component{
   }
 
   render() {
-    return (
-      <div className='list-group'>
-        {(this.props.status.isFetching == true) && (
-          <div className="isLoading" style={{marginTop: 80, marginBottom: 80}}>
-            <div className="loader"></div>
-          </div>
-        )}
-        {(this.props.status.fetchSuccess == false) && (
-          <div className="alert alert-danger">
-            <strong>Erreur : </strong>
-            la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème
-          </div>
-        )}
-        {this.props.journeyPatterns.map((journeyPattern, index) =>
-          <JourneyPattern
-            value={ journeyPattern }
-            key={ index }
-            onCheckboxChange= {(e) => this.props.onCheckboxChange(e, index)}
-            onOpenEditModal= {() => this.props.onOpenEditModal(index, journeyPattern)}
-          />
-        )}
-      </div>
-    )
+    if(this.props.status.isFetching == true) {
+      return (
+        <div className="isLoading" style={{marginTop: 80, marginBottom: 80}}>
+          <div className="loader"></div>
+        </div>
+      )
+    } else {
+      return (
+        <div className='list-group'>
+          {(this.props.status.fetchSuccess == false) && (
+            <div className="alert alert-danger">
+              <strong>Erreur : </strong>
+              la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème
+            </div>
+          )}
+          {this.props.journeyPatterns.map((journeyPattern, index) =>
+            <JourneyPattern
+              value={ journeyPattern }
+              key={ index }
+              onCheckboxChange= {(e) => this.props.onCheckboxChange(e, index)}
+              onOpenEditModal= {() => this.props.onOpenEditModal(index, journeyPattern)}
+              />
+          )}
+        </div>
+      )
+    }
   }
 }