Merge pull request #539 from onaio/gisida-timeout

Add Gisida timeout
onaio · Oct 17, 2019 · fcf2b2d · fcf2b2d
2 parents 576f079 + b88c5fe
commit fcf2b2d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.env.sample b/.env.sample
@@ -28,6 +28,7 @@ REACT_APP_SUPERSET_IRS_REPORTING_INDICATOR_ROWS=zambia2019
 REACT_APP_SUPERSET_STRUCTURES_SLICE=0
 REACT_APP_SUPERSET_TASKS_SLICE=0
 REACT_APP_SUPERSET_PLAN_STRUCTURE_PIVOT_SLICE=0
+REACT_APP_GISIDA_TIMEOUT=3000
 REACT_APP_GISIDA_MAPBOX_TOKEN=hunter2
 REACT_APP_GISIDA_ONADATA_API_TOKEN=hunter2
 REACT_APP_DIGITAL_GLOBE_CONNECT_ID=mylifeforaiur

diff --git a/src/components/GisidaWrapper/index.tsx b/src/components/GisidaWrapper/index.tsx
@@ -7,11 +7,7 @@ import { FillPaint, LinePaint, Map as mbMap, Style, SymbolPaint } from 'mapbox-g
 import * as React from 'react';
 import { GREY } from '../../colors';
 import Loading from '../../components/page/Loading/index';
-import {
-  GISIDA_MAPBOX_TOKEN,
-  GISIDA_ONADATA_API_TOKEN,
-  SUPERSET_MAX_RECORDS,
-} from '../../configs/env';
+import { GISIDA_MAPBOX_TOKEN, GISIDA_ONADATA_API_TOKEN, GISIDA_TIMEOUT } from '../../configs/env';
 import {
   circleLayerConfig,
   fillLayerConfig,
@@ -184,7 +180,7 @@ class GisidaWrapper extends React.Component<GisidaProps, GisidaState> {
           // Dirty work around! Arbitrary delay to allow style load before adding layers
           setTimeout(() => {
             this.initMap(null, null);
-          }, SUPERSET_MAX_RECORDS);
+          }, GISIDA_TIMEOUT);
         }
       );
     } else if (!this.state.locations) {
@@ -212,7 +208,7 @@ class GisidaWrapper extends React.Component<GisidaProps, GisidaState> {
           // Dirty work around! Arbitrary delay to allow style load before adding layers
           setTimeout(() => {
             this.initMap(null, null);
-          }, SUPERSET_MAX_RECORDS);
+          }, GISIDA_TIMEOUT);
         }
       );
     }
@@ -261,7 +257,7 @@ class GisidaWrapper extends React.Component<GisidaProps, GisidaState> {
           // Dirty work around! Arbitrary delay to allow style load before adding layers
           setTimeout(() => {
             this.initMap(null, null);
-          }, SUPERSET_MAX_RECORDS);
+          }, GISIDA_TIMEOUT);
         }
       );
     }

diff --git a/src/configs/__mocks__/env.ts b/src/configs/__mocks__/env.ts
@@ -10,6 +10,9 @@ export type SUPERSET_PLANS_SLICE = typeof SUPERSET_PLANS_SLICE;
 export const SUPERSET_MAX_RECORDS = 3000;
 export type SUPERSET_MAX_RECORDS = typeof SUPERSET_MAX_RECORDS;
 
+export const GISIDA_TIMEOUT = 3000;
+export type GISIDA_TIMEOUT = typeof GISIDA_TIMEOUT;
+
 export const GISIDA_MAPBOX_TOKEN = 'hunter2';
 export type GISIDA_MAPBOX_TOKEN = typeof GISIDA_MAPBOX_TOKEN;
 

diff --git a/src/configs/env.ts b/src/configs/env.ts
@@ -156,6 +156,10 @@ export type ONADATA_USER_URL = typeof ONADATA_USER_URL;
 export const ONADATA_OAUTH_STATE = process.env.REACT_APP_ONADATA_OAUTH_STATE || 'onadata';
 export type ONADATA_OAUTH_STATE = typeof ONADATA_OAUTH_STATE;
 
+/** The max number of records to get from Superset API endpoint */
+export const GISIDA_TIMEOUT = Number(process.env.REACT_APP_GISIDA_TIMEOUT) || 3000;
+export type GISIDA_TIMEOUT = typeof GISIDA_TIMEOUT;
+
 export const GISIDA_MAPBOX_TOKEN = process.env.REACT_APP_GISIDA_MAPBOX_TOKEN || '';
 export type GISIDA_MAPBOX_TOKEN = typeof GISIDA_MAPBOX_TOKEN;