From b9cf54ce26e8991e8287946c03c16f41af63d7a3 Mon Sep 17 00:00:00 2001 From: jpl Date: Thu, 12 Jan 2017 14:38:55 +0100 Subject: update isFetching loader integration --- .../journey_patterns/components/JourneyPatterns.js | 49 ++++++++++++---------- 1 file changed, 26 insertions(+), 23 deletions(-) (limited to 'app/assets/javascripts') 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 ( -
- {(this.props.status.isFetching == true) && ( -
-
-
- )} - {(this.props.status.fetchSuccess == false) && ( -
- Erreur : - la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème -
- )} - {this.props.journeyPatterns.map((journeyPattern, index) => - this.props.onCheckboxChange(e, index)} - onOpenEditModal= {() => this.props.onOpenEditModal(index, journeyPattern)} - /> - )} -
- ) + if(this.props.status.isFetching == true) { + return ( +
+
+
+ ) + } else { + return ( +
+ {(this.props.status.fetchSuccess == false) && ( +
+ Erreur : + la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème +
+ )} + {this.props.journeyPatterns.map((journeyPattern, index) => + this.props.onCheckboxChange(e, index)} + onOpenEditModal= {() => this.props.onOpenEditModal(index, journeyPattern)} + /> + )} +
+ ) + } } } -- cgit v1.2.3