Close Disambiguation Popup on New Search

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - Close Disambiguation Popup on Reset [#812](https://github.com/open-apparel-registry/open-apparel-registry/pull/812)
+- Close Disambiguation Popup on New Search [#825](https://github.com/open-apparel-registry/open-apparel-registry/pull/825)
 - Change "Accept" to "Confirm" in About/Processing [#815](https://github.com/open-apparel-registry/open-apparel-registry/pull/815)
 - Regularize vector tile map zoom behavior [#799](https://github.com/open-apparel-registry/open-apparel-registry/pull/799)
 

src/app/src/components/FacilitiesMap.jsx

@@ -73,6 +73,7 @@ const unselectedMarkerIcon = createIcon(unselectedMarkerURL);
 const selectedMarkerIcon = createIcon(selectedMarkerURL);
 
 function FacilitiesMap({
+    fetching,
     data,
     navigateToFacilityDetails,
     facilityDetailsData,
@@ -226,6 +227,13 @@ function FacilitiesMap({
         setFacilitiesToDisambiguate,
     ]);
 
+    useEffect(() => {
+        // Close multiple facilities popup on fresh searches
+        if (fetching) {
+            setFacilitiesToDisambiguate(null);
+        }
+    }, [fetching]);
+
     if (!clientInfoFetched) {
         return null;
     }
@@ -358,6 +366,7 @@ FacilitiesMap.defaultProps = {
 };
 
 FacilitiesMap.propTypes = {
+    fetching: bool.isRequired,
     data: facilityCollectionPropType,
     navigateToFacilityDetails: func.isRequired,
     facilityDetailsData: facilityPropType,
@@ -373,7 +382,7 @@ FacilitiesMap.propTypes = {
 
 function mapStateToProps({
     facilities: {
-        facilities: { data },
+        facilities: { fetching, data },
         singleFacility: { data: facilityDetailsData },
     },
     ui: {
@@ -382,6 +391,7 @@ function mapStateToProps({
     clientInfo: { fetched, countryCode },
 }) {
     return {
+        fetching,
         data,
         facilityDetailsData,
         resetButtonClickCount,

src/app/src/components/VectorTileFacilitiesLayer.jsx

@@ -269,6 +269,13 @@ const VectorTileFacilitiesLayer = ({
         }
     };
 
+    useEffect(() => {
+        // Close multiple facilities popup on fresh searches
+        if (fetching) {
+            closeMultipleFacilitiesPopup();
+        }
+    }, [fetching]);
+
     return (
         <>
             <VectorGrid