fix: Handle error if org unit selection is invalid for thematic layer…

…s (DHIS2-8479) (#496) * fix: Handle error if org unit selection is invalid for thematic layers (DHIS2-8479) * chore: remove redundant code
dhis2 · Mar 17, 2020 · 8ec724e · 8ec724e
1 parent ef2946b
commit 8ec724e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/src/components/map/Layer.js b/src/components/map/Layer.js
@@ -27,6 +27,8 @@ class Layer extends PureComponent {
         isVisible: true,
     };
 
+    state = {};
+
     constructor(...args) {
         super(...args);
         this.setPeriod();
@@ -43,7 +45,7 @@ class Layer extends PureComponent {
             editCounter,
             dataFilters,
         } = this.props;
-        const { period } = this.state || {};
+        const { period } = this.state;
         const { period: prevPeriod } = prevState || {};
         const isEdited = editCounter !== prevProps.editCounter;
 

diff --git a/src/components/map/ThematicLayer.js b/src/components/map/ThematicLayer.js
@@ -31,6 +31,7 @@ class ThematicLayer extends Layer {
             valuesByPeriod,
             renderingStrategy = 'SINGLE',
         } = this.props;
+
         const { period } = this.state;
         let periodData = data;
 
@@ -86,6 +87,11 @@ class ThematicLayer extends Layer {
     // Set initial period
     setPeriod(callback) {
         const { period, periods, renderingStrategy } = this.props;
+
+        if (!period || !periods) {
+            return;
+        }
+
         const initialPeriod = {
             period:
                 renderingStrategy === 'SINGLE' ? null : period || periods[0],

diff --git a/src/loaders/thematicLoader.js b/src/loaders/thematicLoader.js
@@ -26,6 +26,18 @@ import {
 } from '../constants/layers';
 
 const thematicLoader = async config => {
+    const {
+        columns,
+        rows,
+        radiusLow = DEFAULT_RADIUS_LOW,
+        radiusHigh = DEFAULT_RADIUS_HIGH,
+        classes,
+        colorScale,
+        renderingStrategy = 'SINGLE',
+    } = config;
+
+    const dataItem = getDataItemFromColumns(columns);
+
     let error;
 
     const response = await loadData(config).catch(err => {
@@ -40,23 +52,14 @@ const thematicLoader = async config => {
                       alerts: [createAlert(i18n.t('Error'), error.message)],
                   }
                 : {}),
+            name: dataItem ? dataItem.name : i18n.t('Thematic layer'),
             isLoaded: true,
             isVisible: true,
         };
     }
 
     const [features, data] = response;
 
-    const {
-        columns,
-        rows,
-        radiusLow = DEFAULT_RADIUS_LOW,
-        radiusHigh = DEFAULT_RADIUS_HIGH,
-        classes,
-        colorScale,
-        renderingStrategy = 'SINGLE',
-    } = config;
-
     const isSingle = renderingStrategy === 'SINGLE';
     const period = getPeriodFromFilters(config.filters);
     const periods = getPeriodsFromMetaData(data.metaData);
@@ -70,7 +73,6 @@ const thematicLoader = async config => {
     const orderedValues = getOrderedValues(data);
     const minValue = orderedValues[0];
     const maxValue = orderedValues[orderedValues.length - 1];
-    const dataItem = getDataItemFromColumns(columns);
     const name = names[dataItem.id];
 
     let legendSet = config.legendSet;