correct try/catch location.

bcgov · Jun 28, 2023 · eb0b1ed · eb0b1ed
1 parent 97a3b8c
commit eb0b1ed
Showing 1 changed file with 24 additions and 25 deletions.
diff --git a/source/frontend/src/components/maps/hooks/useMapSearch.tsx b/source/frontend/src/components/maps/hooks/useMapSearch.tsx
@@ -51,8 +51,31 @@ export const useMapSearch = () => {
         tileData = pimsProperties.features.length ? pimsProperties : parcel;
       } else {
         let task1, task2, task3;
+
+        task1 = loadProperties(filter);
+
+        if (filter?.PIN) {
+          task2 = parcelsService.findByPin(filter?.PIN);
+        }
+        if (filter?.PID) {
+          task3 = parcelsService.findByPid(filter?.PID);
+        }
+
         try {
-          task1 = loadProperties(filter);
+          const [pidPinInventoryData, pinNonInventoryData, pidNonInventoryData] = await Promise.all(
+            [task1, task2, task3],
+          );
+
+          tileData = pidPinInventoryData?.features?.length
+            ? pidPinInventoryData
+            : ({
+                type: 'FeatureCollection',
+                features: [
+                  ...(pinNonInventoryData?.features || []),
+                  ...(pidNonInventoryData?.features || []),
+                ],
+                bbox: pinNonInventoryData?.bbox || pidNonInventoryData?.bbox,
+              } as FeatureCollection);
         } catch (err) {
           setModalContent({
             title: 'Unable to connect to PIMS Inventory',
@@ -69,30 +92,6 @@ export const useMapSearch = () => {
           });
           setDisplayModal(true);
         }
-
-        if (filter?.PIN) {
-          task2 = parcelsService.findByPin(filter?.PIN);
-        }
-        if (filter?.PID) {
-          task3 = parcelsService.findByPid(filter?.PID);
-        }
-
-        const [pidPinInventoryData, pinNonInventoryData, pidNonInventoryData] = await Promise.all([
-          task1,
-          task2,
-          task3,
-        ]);
-
-        tileData = pidPinInventoryData?.features?.length
-          ? pidPinInventoryData
-          : ({
-              type: 'FeatureCollection',
-              features: [
-                ...(pinNonInventoryData?.features || []),
-                ...(pidNonInventoryData?.features || []),
-              ],
-              bbox: pinNonInventoryData?.bbox || pidNonInventoryData?.bbox,
-            } as FeatureCollection);
       }
       if (tileData) {
         const validFeatures = tileData.features.filter(feature => !!feature?.geometry);