Merge pull request #1812 from bphan002/1805-fix-loading-spinner-on-mo…

…use-over-popups

1805 fix loading spinner on mouse over popups

components/Map/Map.jsx

@@ -8,7 +8,7 @@ import mapboxgl from 'mapbox-gl';
 import FilterMenu from '@components/main/Desktop/FilterMenu';
 // import LocationDetail from './LocationDetail';
 import { REQUEST_TYPES } from '@components/common/CONSTANTS';
-import { getNcByLngLat } from '@reducers/data';
+import { getNcByLngLat, clearPinInfo } from '@reducers/data';
 import {
   updateNcId,
   updateSelectedCouncils,
@@ -457,6 +457,7 @@ class Map extends React.Component {
   };
 
   onMouseLeave = (e) => {
+    this.props.dispatchClearPinInfo()
     this.removePopup();
   };
 
@@ -794,6 +795,7 @@ const mapDispatchToProps = (dispatch) => ({
   dispatchUpdateUnselectedCouncils: (councils) =>
     dispatch(updateUnselectedCouncils(councils)),
   dispatchCloseBoundaries: () => dispatch(closeBoundaries()),
+  dispatchClearPinInfo: () => dispatch(clearPinInfo()),
 });
 
 // We need to specify forwardRef to allow refs on connected components.

redux/reducers/data.js

@@ -10,6 +10,7 @@ export const types = {
   GET_OPEN_REQUESTS_SUCCESS: 'GET_OPEN_REQUESTS_SUCCESS',
   GET_OPEN_REQUESTS_FAILURE: 'GET_OPEN_REQUESTS_FAILURE',
   UPDATE_PIN_INFO: 'UPDATE_PIN_INFO',
+  CLEAR_PIN_INFO: 'CLEAR_PIN_INFO',
   GET_PIN_INFO_REQUEST: 'GET_PIN_INFO_REQUEST',
   GET_PIN_INFO_SUCCESS: 'GET_PIN_INFO_SUCCESS',
   GET_PIN_INFO_FAILURE: 'GET_PIN_INFO_FAILURE',
@@ -64,6 +65,10 @@ export const updatePinInfo = pinData => ({
   payload: pinData,
 });
 
+export const clearPinInfo = () => ({
+  type: types.CLEAR_PIN_INFO,
+});
+
 export const getPinInfoRequest = requestId => ({
   type: types.GET_PIN_INFO_REQUEST,
   payload: requestId,
@@ -211,6 +216,12 @@ export default (state = initialState, action) => {
           ...action.payload,
         },
       };
+    case types.CLEAR_PIN_INFO:
+      return {
+        ...state,
+        error: null,
+        pinsInfo: {},
+      };
     case types.GET_PIN_INFO_SUCCESS:
       return {
         ...state,