clean up selection and onSelectionChange

complexdatacollective · Dec 17, 2024 · 5d49cb6 · 5d49cb6
1 parent 266def4
commit 5d49cb6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/interviewer/containers/Interfaces/Geospatial.tsx b/lib/interviewer/containers/Interfaces/Geospatial.tsx
@@ -106,13 +106,13 @@ export default function GeospatialInterface({
       tokenId,
       getAssetUrl,
       initialSelectionValue,
-      onSelectionChange: (selection: unknown) => {
+      onSelectionChange: (value: string) => {
         if (currentPrompt && stageNodes[navState.activeIndex]) {
           updateNode(
             stageNodes[navState.activeIndex][entityPrimaryKeyProperty],
             {},
             {
-              [currentPrompt.variable]: selection,
+              [currentPrompt.variable]: value,
             },
           );
         }

diff --git a/lib/interviewer/hooks/useMapbox.ts b/lib/interviewer/hooks/useMapbox.ts
@@ -20,7 +20,7 @@ type UseMapboxProps = {
   tokenId: string;
   getAssetUrl: (url: string) => string;
   initialSelectionValue?: string;
-  onSelectionChange: (value: string | null) => void;
+  onSelectionChange: (value: string) => void;
 };
 
 const useMapboxToken = (tokenId: string) => {
@@ -206,17 +206,19 @@ export const useMapbox = ({
       const feature = e.features[0];
       const propToSelect = selectionLayer.filter;
 
-      const selected = feature?.properties
-        ? feature.properties[propToSelect]
+      const selected: string | null = feature?.properties
+        ? (feature.properties[propToSelect] as string)
         : null;
 
-      onSelectionChange(selected);
+      if (selected !== null) {
+        onSelectionChange(selected);
+      }
 
       if (selectionLayer && mapInstance) {
         mapInstance.setFilter(selectionLayer.id, [
           '==',
           selectionLayer.filter,
-          selected,
+          selected ?? '',
         ]);
       }
     };