Merge pull request #1089 from IFRCGo/fix/country-empty-bbox

Add check for empty bbox of country
IFRCGo · May 23, 2024 · b0cb0eb · b0cb0eb
2 parents c544e98 + 8a4f26d
commit b0cb0eb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 deletions.
diff --git a/.changeset/stupid-pandas-juggle.md b/.changeset/stupid-pandas-juggle.md
@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Avoid crash on country pages for countries without bbox
diff --git a/...ws/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsMap/index.tsx b/...ws/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsMap/index.tsx
@@ -1,4 +1,8 @@
-import react, { useMemo } from 'react';
+import {
+    useCallback,
+    useMemo,
+    useState,
+} from 'react';
 import { useOutletContext } from 'react-router-dom';
 import {
     ArtboardLineIcon,
@@ -132,7 +136,7 @@ function LocalUnitsMap(props: Props) {
         pageSize: 9999,
     });
 
-    const urlQuery = react.useMemo<GoApiUrlQuery<'/api/v2/public-local-units/'>>(
+    const urlQuery = useMemo<GoApiUrlQuery<'/api/v2/public-local-units/'>>(
         () => ({
             limit,
             type__code: filter.type,
@@ -183,11 +187,11 @@ function LocalUnitsMap(props: Props) {
     const [
         clickedPointProperties,
         setClickedPointProperties,
-    ] = react.useState<ClickedPoint | undefined>();
+    ] = useState<ClickedPoint | undefined>();
 
-    const [loadedIcons, setLoadedIcons] = react.useState<Record<string, boolean>>({});
+    const [loadedIcons, setLoadedIcons] = useState<Record<string, boolean>>({});
 
-    const handleIconLoad = react.useCallback(
+    const handleIconLoad = useCallback(
         (loaded: boolean, key: string) => {
             setLoadedIcons((prevValue) => ({
                 ...prevValue,
@@ -197,7 +201,7 @@ function LocalUnitsMap(props: Props) {
         [],
     );
 
-    const allIconsLoaded = react.useMemo(
+    const allIconsLoaded = useMemo(
         () => (
             Object.values(loadedIcons).filter(Boolean).length === sumSafe([
                 localUnitsOptions?.type.length,
@@ -207,7 +211,7 @@ function LocalUnitsMap(props: Props) {
         [loadedIcons, localUnitsOptions],
     );
 
-    const localUnitPointLayerOptions: Omit<CircleLayer, 'id'> = react.useMemo(() => ({
+    const localUnitPointLayerOptions: Omit<CircleLayer, 'id'> = useMemo(() => ({
         layout: {
             visibility: 'visible',
         },
@@ -236,8 +240,10 @@ function LocalUnitsMap(props: Props) {
         },
     }), [localUnitsOptions]);
 
-    const countryBounds = react.useMemo(() => (
-        countryResponse ? getBbox(countryResponse.bbox) : undefined
+    const countryBounds = useMemo(() => (
+        (countryResponse && countryResponse.bbox)
+            ? getBbox(countryResponse.bbox)
+            : undefined
     ), [countryResponse]);
 
     const {
@@ -276,7 +282,7 @@ function LocalUnitsMap(props: Props) {
         ? publicLocalUnitDetailError
         : superLocalUnitDetailError;
 
-    const localUnitsGeoJson = react.useMemo<GeoJSON.FeatureCollection<GeoJSON.Geometry>>(
+    const localUnitsGeoJson = useMemo<GeoJSON.FeatureCollection<GeoJSON.Geometry>>(
         () => ({
             type: 'FeatureCollection' as const,
             features: localUnits?.results?.map(
@@ -305,7 +311,7 @@ function LocalUnitsMap(props: Props) {
         [localUnits],
     );
 
-    const handlePointClick = react.useCallback(
+    const handlePointClick = useCallback(
         (feature: mapboxgl.MapboxGeoJSONFeature, lngLat: mapboxgl.LngLat) => {
             setClickedPointProperties({
                 id: feature.properties?.id,
@@ -317,14 +323,14 @@ function LocalUnitsMap(props: Props) {
         [setClickedPointProperties],
     );
 
-    const handlePointClose = react.useCallback(
+    const handlePointClose = useCallback(
         () => {
             setClickedPointProperties(undefined);
         },
         [setClickedPointProperties],
     );
 
-    const emailRendererParams = react.useCallback(
+    const emailRendererParams = useCallback(
         (_: string, email: string): LinkProps => ({
             className: styles.email,
             withUnderline: true,

diff --git a/app/src/views/CountryOngoingActivitiesEmergencies/index.tsx b/app/src/views/CountryOngoingActivitiesEmergencies/index.tsx
@@ -170,9 +170,10 @@ export function Component(props: BaseProps) {
         pageSize: 5,
     });
 
-    const countryBounds = useMemo(() => (countryResponse
-        ? getBbox(countryResponse.bbox)
-        : undefined
+    const countryBounds = useMemo(() => (
+        (countryResponse && countryResponse.bbox)
+            ? getBbox(countryResponse.bbox)
+            : undefined
     ), [countryResponse]);
 
     const query = useMemo<AppealQueryParams>(

diff --git a/app/src/views/CountryOngoingActivitiesThreeWProjects/Map/index.tsx b/app/src/views/CountryOngoingActivitiesThreeWProjects/Map/index.tsx
@@ -170,7 +170,9 @@ function CountryThreeWMap(props: Props) {
     } = useGlobalEnums();
 
     const countryBounds = useMemo(() => (
-        countryResponse ? getBbox(countryResponse.bbox) : undefined
+        (countryResponse && countryResponse.bbox)
+            ? getBbox(countryResponse.bbox)
+            : undefined
     ), [countryResponse]);
 
     const [

diff --git a/app/src/views/CountryProfileRiskWatch/index.tsx b/app/src/views/CountryProfileRiskWatch/index.tsx
@@ -116,10 +116,11 @@ export function Component() {
 
     // NOTE: we always get 1 child in the response
     const riskResponse = countryRiskResponse?.[0];
-    const bbox = useMemo(
-        () => (countryResponse ? getBbox(countryResponse.bbox) : undefined),
-        [countryResponse],
-    );
+    const bbox = useMemo(() => (
+        (countryResponse && countryResponse.bbox)
+            ? getBbox(countryResponse.bbox)
+            : undefined
+    ), [countryResponse]);
 
     return (
         <Container