better error handling

yext · Nov 18, 2021 · 0b2a2e1 · 0b2a2e1
1 parent f6b53ad
commit 0b2a2e1
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/sample-app/src/components/LocationBias.tsx b/sample-app/src/components/LocationBias.tsx
@@ -34,11 +34,15 @@ export default function LocationBias(props: Props) {
           : '';
 
   async function handleGeolocationClick() {
-    const position = await SearchHandler.getUserLocation(geolocationOptions);
-    answersActions.setUserLocation({
-      latitude: position.coords.latitude,
-      longitude: position.coords.longitude,
-    })
+    try {
+      const position = await SearchHandler.getUserLocation(geolocationOptions);
+      answersActions.setUserLocation({
+        latitude: position.coords.latitude,
+        longitude: position.coords.longitude,
+      });
+    } catch (e) {
+      console.error(e);
+    }
     SearchHandler.executeSearch(answersActions, isVertical);
   }
 

diff --git a/sample-app/src/components/SearchBar.tsx b/sample-app/src/components/SearchBar.tsx
@@ -39,11 +39,15 @@ export default function SearchBar({
   async function executeQuery () {
     const responseToLatestRequest = await responseToLatestRequestRef.current;
     if (responseToLatestRequest?.inputIntents.includes(SearchIntent.NearMe)) {
-      const position = await SearchHandler.getUserLocation(geolocationOptions);
-      answersActions.setUserLocation({
-        latitude: position.coords.latitude,
-        longitude: position.coords.longitude,
-      })
+      try {
+        const position = await SearchHandler.getUserLocation(geolocationOptions);
+        answersActions.setUserLocation({
+          latitude: position.coords.latitude,
+          longitude: position.coords.longitude,
+        });
+      } catch(e) {
+        console.error(e);
+      }
     }
     SearchHandler.executeSearch(answersActions, true);
   }

diff --git a/sample-app/src/pages/UniversalSearchPage.tsx b/sample-app/src/pages/UniversalSearchPage.tsx
@@ -22,11 +22,15 @@ export default function UniversalSearchPage(props: { universalResultsConfig: Uni
     const executeQuery = async () => {
       const searchIntents = await SearchHandler.getSearchIntents(answersActions, false);
       if (searchIntents?.includes(SearchIntent.NearMe)) {
-        const position = await SearchHandler.getUserLocation();
-        answersActions.setUserLocation({
-          latitude: position.coords.latitude,
-          longitude: position.coords.longitude,
-        })
+        try {
+          const position = await SearchHandler.getUserLocation();
+          answersActions.setUserLocation({
+            latitude: position.coords.latitude,
+            longitude: position.coords.longitude,
+          });
+        } catch (e) {
+          console.error(e);
+        }
       }
       SearchHandler.executeSearch(answersActions, false);
     };

diff --git a/sample-app/src/pages/VerticalSearchPage.tsx b/sample-app/src/pages/VerticalSearchPage.tsx
@@ -73,11 +73,15 @@ export default function VerticalSearchPage(props: {
     const executeQuery = async () => {
       const searchIntents = await SearchHandler.getSearchIntents(answersActions, false);
       if (searchIntents?.includes(SearchIntent.NearMe)) {
-        const position = await SearchHandler.getUserLocation();
-        answersActions.setUserLocation({
-          latitude: position.coords.latitude,
-          longitude: position.coords.longitude,
-        })
+        try {
+          const position = await SearchHandler.getUserLocation();
+          answersActions.setUserLocation({
+            latitude: position.coords.latitude,
+            longitude: position.coords.longitude,
+          });
+        } catch (e) {
+          console.error(e);
+        }
       }
       SearchHandler.executeSearch(answersActions, true);
     };

diff --git a/sample-app/src/utils/searchhandler.ts b/sample-app/src/utils/searchhandler.ts
@@ -34,15 +34,13 @@ export default class SearchHandler {
         navigator.geolocation.getCurrentPosition(
           position => resolve(position),
           err => { 
-            console.log(err);
-            console.error('Unable to determine user\'s location.');
-            reject(); 
+            console.error('Error occured using geolocation API. Unable to determine user\'s location.');
+            reject(err); 
           },
           Object.assign(defaultGeolocationOptions, geolocationOptions)
         );
       } else {
-        console.error('Unable to determine user\'s location.');
-        reject();
+        reject('No access to geolocation API. Unable to determine user\'s location.');
       }
     });
   }