Merge pull request #761 from metasfresh/dev-713

#713 Error handling
metasfresh · May 18, 2017 · 7d92cda · 7d92cda
2 parents 510be75 + 03bec0d
commit 7d92cda
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/components/charts/RawChart.js b/src/components/charts/RawChart.js
@@ -15,7 +15,8 @@ class RawChart extends Component {
 
         this.state = {
             chartData: [],
-            intervalId: null
+            intervalId: null,
+            err: null
         }
     }
 
@@ -26,21 +27,23 @@ class RawChart extends Component {
             return getTargetIndicatorsData(id)()
                 .then(response => {
                     return response.data.datasets[0].values
-                });
+                }).catch(err => {throw err});
         }
 
         return getKPIData(id)()
             .then(response => {
                 return response.data.datasets[0].values
             })
-            .catch(()=>{});
+            .catch(err => {throw err});
     }
 
     fetchData(){
         this.getData()
             .then(chartData => {
-                this.setState({ chartData });
-            });
+                this.setState({ chartData: chartData, err: null });
+            }).catch(err => {
+                this.setState({ err })
+            })
     }
 
     componentDidMount(){
@@ -135,13 +138,13 @@ class RawChart extends Component {
     }
 
     render(){
-        const {chartData} = this.state;
+        const {chartData, err} = this.state;
+
+        return err ?
+            this.renderError() :
+            (chartData && chartData.length > 0 ?
+                this.renderChart() : <div>No data</div>)
 
-        if(chartData){
-            return chartData.length > 0 && this.renderChart();
-        } else {
-            return this.renderError();
-        }
     }
 }
 

diff --git a/src/components/filters/FiltersItem.js b/src/components/filters/FiltersItem.js
@@ -93,13 +93,13 @@ class FiltersItem extends Component {
         const {filter} = this.state;
 
         if(
-            filter && 
-            filter.parametersLayoutType === 'singleOverlayField' && 
+            filter &&
+            filter.parametersLayoutType === 'singleOverlayField' &&
             !filter.parameters[0].value
         ){
             return this.handleClear();
         }
-        
+
         applyFilters(filter, () => {
             closeFilterMenu();
         });