Dynamic error cdi; COUNTRY=jordan

README.md

@@ -343,7 +343,7 @@ cd frontend
 yarn clean
 yarn install
 yarn setup:common
-REACT_APP_COUNTRY=cambodia yarn start
+REACT_APP_COUNTRY=jordan REACT_APP_USE_LOCAL_HIP_SERVICE=http://localhost:3001/q_multi_geojson docker compose up
 ```
 
 ### Available Scripts

frontend/docker-compose.yml

@@ -8,6 +8,7 @@ services:
  entrypoint: yarn start
  environment:
  - REACT_APP_COUNTRY
+ - REACT_APP_USE_LOCAL_HIP_SERVICE=http://localhost:3001/q_multi_geojson
  ports:
  - "3000:3000"
  volumes:

frontend/src/context/layers/composite_data.ts

@@ -19,7 +19,10 @@ export const fetchCompositeLayerData: LazyLoader<CompositeLayerProps> = () => as
  const endDate = new Date(startDate);
  endDate.setMonth(endDate.getMonth() + 1);
 
- const { baseUrl, inputLayers, startDate: areaStartDate } = layer;
+ const { baseUrl: _baseUrl, inputLayers, startDate: areaStartDate } = layer;
+ const baseUrl = process.env.REACT_APP_USE_LOCAL_HIP_SERVICE
+ ? process.env.REACT_APP_USE_LOCAL_HIP_SERVICE
+ : _baseUrl;
  const { boundingBox } = appConfig.map;
 
  // docs: https://hip-service.ovio.org/docs#/default/run_q_multi_geojson_q_multi_geojson_post

frontend/src/utils/fetch-with-timeout.ts

@@ -29,10 +29,16 @@ export const fetchWithTimeout = async (
  signal: controller.signal,
  });
  if (!res.ok) {
- throw new HTTPError(
- fetchErrorMessage ?? `Something went wrong requesting at ${resource}`,
- res.status,
- );
+ await res.json().then(r => {
+ // eslint-disable-next-line no-console
+ console.log(r);
+ throw new HTTPError(
+ r.detail ??
+ fetchErrorMessage ??
+ `Something went wrong requesting at ${resource}`,
+ res.status,
+ );
+ });
  }
  return res;
  } catch (error) {