Merge pull request #1910 from bphan002/1902-de-select-nc-selection-on-outside-click

1902 de select nc selection on outside click

Author: ryanfchase

components/Map/Map.jsx

@@ -437,7 +437,7 @@ class Map extends React.Component {
   };
 
   reset = () => {
-    const { dispatchUpdateNcId } = this.props;
+    const { dispatchUpdateNcId, dispatchUpdateSelectedCouncils } = this.props;
 
     this.zoomOut();
     this.addressLayer.clearMarker();
@@ -463,23 +463,18 @@ class Map extends React.Component {
     });
 
     // Reset MinZoom to original value after deselecting NC
+    this.resetBoundaries();
+    dispatchUpdateSelectedCouncils([])
     this.map.setMinZoom(DEFAULT_MIN_ZOOM);
   };
 
   resetBoundaries = () => {
     const {
       dispatchUpdateNcId,
-      dispatchUpdateSelectedCouncils,
-      dispatchUpdateUnselectedCouncils,
-      councils,
     } = this.props;
 
     // Reset the selected NcId back to null.
     dispatchUpdateNcId(null);
-
-    // Reset councilSelector.
-    dispatchUpdateSelectedCouncils([]);
-    dispatchUpdateUnselectedCouncils(councils);
   };
 
   addressSearchIsEmpty = () => {

components/main/Desktop/CouncilSelector/index.jsx

@@ -44,18 +44,8 @@ function CouncilSelector({
   }, [councils, dispatchUpdateUnselectedCouncils]);
 
   const handleDelete = e => {
-    const deletedCouncilId = Number(e.currentTarget.dataset.id);
-    const newSelected = selected.filter(
-      ({ councilId }) => councilId !== deletedCouncilId,
-    );
-    const newUnselected = not(councils, newSelected, 'councilId');
-    dispatchUpdateSelectedCouncils(newSelected);
-    dispatchUpdateUnselectedCouncils(newUnselected);
     // Clear out address search input
     resetAddressSearch();
-
-    // resetMap() will call dispatchUpdateNcId(null) to reset councilId back to null
-    // in reducers/filters so no need to do it again here
     resetMap();
     //Clear district council search box field on deselect
     setSearchTerm('');