psp-10976 HOTFIX correct pmbc result duplication when clicking on PIM…

source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx

@@ -24,6 +24,56 @@ export interface ISearchContainerProps {
   View: React.FunctionComponent<ISearchViewProps>;
 }
 
+const useEnrichedDatasets = (
+  baseDatasets: SelectedFeatureDataset[],
+  findRegion: ReturnType<typeof useAdminBoundaryMapLayer>['findRegion'],
+  findDistrict: ReturnType<typeof useAdminBoundaryMapLayer>['findDistrict'],
+): SelectedFeatureDataset[] => {
+  const [selectedFeatureDatasets, setSelectedFeatureDatasets] = useState<SelectedFeatureDataset[]>(
+    [],
+  );
+
+  useEffect(() => {
+    let cancelled = false;
+
+    async function fetchRegions() {
+      if (baseDatasets.length === 0) {
+        setSelectedFeatureDatasets([]);
+        return;
+      }
+
+      const results = await getRegionAndDistrictsResults(baseDatasets, findRegion, findDistrict);
+
+      if (cancelled) return;
+
+      const enriched = baseDatasets.map(dataset => {
+        const key = featureSetToLatLngKey(dataset);
+        if (results.has(key)) {
+          const { regionResult, districtResult } = results.get(key)!;
+          return {
+            ...dataset,
+            regionFeature: regionResult,
+            districtFeature: districtResult,
+          };
+        } else {
+          return dataset;
+        }
+      });
+
+      setSelectedFeatureDatasets(enriched);
+    }
+
+    fetchRegions();
+
+    // Cleanup function to avoid state updates if component unmounts
+    return () => {
+      cancelled = true;
+    };
+  }, [baseDatasets, findDistrict, findRegion]);
+
+  return selectedFeatureDatasets;
+};
+
 export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
   const {
     mapSearchCriteria,
@@ -40,7 +90,6 @@ export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
   const pathGenerator = usePathGenerator();
 
   const { findDistrict, findRegion } = useAdminBoundaryMapLayer();
-  const [isPimsActive, setIsPimsActive] = useState(false);
 
   const handleMapFilterChange = (filter: IPropertyFilter) => {
     if (['coordinates', 'name', 'address'].includes(filter.searchBy)) {
@@ -69,136 +118,135 @@ export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
     }
   };
 
-  // Base dataset (no region/district yet)
-  const baseDatasets = useMemo<SelectedFeatureDataset[]>(() => {
-    if (isPimsActive) {
-      return (
-        mapFeatureData?.pimsFeatures.features.map<SelectedFeatureDataset>(pimsParcel => {
-          const center = getFeatureBoundedCenter(pimsParcel);
-          return {
-            parcelFeature: null,
-            pimsFeature: pimsParcel,
-            location: { lat: center[1], lng: center[0] },
-            regionFeature: null,
-            fileLocation: null,
-            fileBoundary: null,
-            districtFeature: null,
-            municipalityFeature: null,
-            selectingComponentId: null,
-          };
-        }) ?? []
-      );
-    } else {
-      return (
-        mapFeatureData?.fullyAttributedFeatures.features.map<SelectedFeatureDataset>(pmbcParcel => {
-          const center = getFeatureBoundedCenter(pmbcParcel);
-          return {
-            parcelFeature: pmbcParcel,
-            pimsFeature: null,
-            location:
-              exists(center) && center.length >= 2 ? { lat: center[1], lng: center[0] } : null,
-            regionFeature: null,
-            fileLocation: null,
-            fileBoundary: null,
-            districtFeature: null,
-            municipalityFeature: null,
-            selectingComponentId: null,
-          };
-        }) ?? []
-      );
-    }
-  }, [mapFeatureData, isPimsActive]);
-
-  // Enrich dataset with region/district info
-  const [selectedFeatureDatasets, setSelectedFeatureDatasets] = useState<SelectedFeatureDataset[]>(
-    [],
+  // Base datasets (no region/district yet)
+  const pimsBaseDatasets = useMemo<SelectedFeatureDataset[]>(() => {
+    return (
+      mapFeatureData?.pimsFeatures.features.map<SelectedFeatureDataset>(pimsParcel => {
+        const center = getFeatureBoundedCenter(pimsParcel);
+        return {
+          parcelFeature: null,
+          pimsFeature: pimsParcel,
+          location:
+            exists(center) && center.length >= 2 ? { lat: center[1], lng: center[0] } : null,
+          regionFeature: null,
+          fileLocation: null,
+          fileBoundary: null,
+          districtFeature: null,
+          municipalityFeature: null,
+          selectingComponentId: null,
+        };
+      }) ?? []
+    );
+  }, [mapFeatureData]);
+
+  const pmbcBaseDatasets = useMemo<SelectedFeatureDataset[]>(() => {
+    return (
+      mapFeatureData?.fullyAttributedFeatures.features.map<SelectedFeatureDataset>(pmbcParcel => {
+        const center = getFeatureBoundedCenter(pmbcParcel);
+        return {
+          parcelFeature: pmbcParcel,
+          pimsFeature: null,
+          location:
+            exists(center) && center.length >= 2 ? { lat: center[1], lng: center[0] } : null,
+          regionFeature: null,
+          fileLocation: null,
+          fileBoundary: null,
+          districtFeature: null,
+          municipalityFeature: null,
+          selectingComponentId: null,
+        };
+      }) ?? []
+    );
+  }, [mapFeatureData]);
+
+  const pimsSelectedFeatureDatasets = useEnrichedDatasets(
+    pimsBaseDatasets,
+    findRegion,
+    findDistrict,
   );
 
-  useEffect(() => {
-    let cancelled = false;
-
-    async function fetchRegions() {
-      if (baseDatasets.length === 0) {
-        setSelectedFeatureDatasets([]);
-        return;
-      }
-
-      const results = await getRegionAndDistrictsResults(baseDatasets, findRegion, findDistrict);
+  const pmbcSelectedFeatureDatasets = useEnrichedDatasets(
+    pmbcBaseDatasets,
+    findRegion,
+    findDistrict,
+  );
 
-      if (cancelled) return;
+  // Actions for creating new files
+  const onCreateResearchFile = useCallback(
+    (isPims: boolean) => {
+      const datasets = isPims ? pimsSelectedFeatureDatasets : pmbcSelectedFeatureDatasets;
+      prepareForCreation(datasets);
+      pathGenerator.newFile('research');
+    },
+    [pathGenerator, prepareForCreation, pimsSelectedFeatureDatasets, pmbcSelectedFeatureDatasets],
+  );
 
-      const enriched = baseDatasets.map(dataset => {
-        const key = featureSetToLatLngKey(dataset);
-        if (results.has(key)) {
-          const { regionResult, districtResult } = results.get(key)!;
-          return {
-            ...dataset,
-            regionFeature: regionResult,
-            districtFeature: districtResult,
-          };
-        } else {
-          return dataset;
-        }
-      });
+  const onCreateAcquisitionFile = useCallback(
+    (isPims: boolean) => {
+      const datasets = isPims ? pimsSelectedFeatureDatasets : pmbcSelectedFeatureDatasets;
+      prepareForCreation(datasets);
+      pathGenerator.newFile('acquisition');
+    },
+    [pathGenerator, prepareForCreation, pimsSelectedFeatureDatasets, pmbcSelectedFeatureDatasets],
+  );
 
-      setSelectedFeatureDatasets(enriched);
-    }
+  const onCreateDispositionFile = useCallback(
+    (isPims: boolean) => {
+      const datasets = isPims ? pimsSelectedFeatureDatasets : pmbcSelectedFeatureDatasets;
+      prepareForCreation(datasets);
+      pathGenerator.newFile('disposition');
+    },
+    [pathGenerator, prepareForCreation, pimsSelectedFeatureDatasets, pmbcSelectedFeatureDatasets],
+  );
 
-    fetchRegions();
+  const onCreateLeaseFile = useCallback(
+    (isPims: boolean) => {
+      const datasets = isPims ? pimsSelectedFeatureDatasets : pmbcSelectedFeatureDatasets;
+      prepareForCreation(datasets);
+      pathGenerator.newFile('lease');
+    },
+    [pathGenerator, prepareForCreation, pimsSelectedFeatureDatasets, pmbcSelectedFeatureDatasets],
+  );
 
-    // Cleanup function to avoid state updates if component unmounts
-    return () => {
-      cancelled = true;
-    };
-  }, [baseDatasets, findDistrict, findRegion]);
+  const onCreateManagementFile = useCallback(
+    (isPims: boolean) => {
+      const datasets = isPims ? pimsSelectedFeatureDatasets : pmbcSelectedFeatureDatasets;
+      prepareForCreation(datasets);
+      pathGenerator.newFile('management');
+    },
+    [pathGenerator, prepareForCreation, pimsSelectedFeatureDatasets, pmbcSelectedFeatureDatasets],
+  );
 
-  // Actions for creating new files
-  const onCreateResearchFile = useCallback(() => {
-    prepareForCreation(selectedFeatureDatasets);
-    pathGenerator.newFile('research');
-  }, [pathGenerator, prepareForCreation, selectedFeatureDatasets]);
-
-  const onCreateAcquisitionFile = useCallback(() => {
-    prepareForCreation(selectedFeatureDatasets);
-    pathGenerator.newFile('acquisition');
-  }, [pathGenerator, prepareForCreation, selectedFeatureDatasets]);
-
-  const onCreateDispositionFile = useCallback(() => {
-    prepareForCreation(selectedFeatureDatasets);
-    pathGenerator.newFile('disposition');
-  }, [pathGenerator, prepareForCreation, selectedFeatureDatasets]);
-
-  const onCreateLeaseFile = useCallback(() => {
-    prepareForCreation(selectedFeatureDatasets);
-    pathGenerator.newFile('lease');
-  }, [pathGenerator, prepareForCreation, selectedFeatureDatasets]);
-
-  const onCreateManagementFile = useCallback(() => {
-    prepareForCreation(selectedFeatureDatasets);
-    pathGenerator.newFile('management');
-  }, [pathGenerator, prepareForCreation, selectedFeatureDatasets]);
-
-  const onAddToOpenFile = useCallback(() => {
-    // If in edit properties mode, prepare the parcel for addition to an open file
-    if (isEditPropertiesMode) {
-      prepareForCreation(selectedFeatureDatasets);
-    }
-  }, [isEditPropertiesMode, prepareForCreation, selectedFeatureDatasets]);
+  const onAddToOpenFile = useCallback(
+    (isPims: boolean) => {
+      // If in edit properties mode, prepare the parcel for addition to an open file
+      if (isEditPropertiesMode) {
+        const datasets = isPims ? pimsSelectedFeatureDatasets : pmbcSelectedFeatureDatasets;
+        prepareForCreation(datasets);
+      }
+    },
+    [
+      isEditPropertiesMode,
+      prepareForCreation,
+      pimsSelectedFeatureDatasets,
+      pmbcSelectedFeatureDatasets,
+    ],
+  );
 
   return (
     <View
       propertyFilter={mapSearchCriteria ?? defaultPropertyFilter}
       onFilterChange={handleMapFilterChange}
       searchResult={mapFeatureData}
-      selectedFeatureDatasets={selectedFeatureDatasets}
+      pmbcSelectedFeatureDatasets={pmbcSelectedFeatureDatasets}
+      pimsSelectedFeatureDatasets={pimsSelectedFeatureDatasets}
       canAddToOpenFile={isEditPropertiesMode}
       onCreateResearchFile={onCreateResearchFile}
       onCreateAcquisitionFile={onCreateAcquisitionFile}
       onCreateDispositionFile={onCreateDispositionFile}
       onCreateLeaseFile={onCreateLeaseFile}
       onCreateManagementFile={onCreateManagementFile}
       onAddToOpenFile={onAddToOpenFile}
-      setIsPimsActive={setIsPimsActive}
     />
   );
 };