[Maps] fix replaceLayerList to handle case where map is not intialized (

#62202) (#62329)
elastic · Apr 2, 2020 · 884c921 · 884c921
1 parent ea53f5f
commit 884c921
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/x-pack/legacy/plugins/maps/public/actions/map_actions.js b/x-pack/legacy/plugins/maps/public/actions/map_actions.js
@@ -174,9 +174,16 @@ export function removeTrackedLayerStateForSelectedLayer() {
 
 export function replaceLayerList(newLayerList) {
   return (dispatch, getState) => {
-    getLayerListRaw(getState()).forEach(({ id }) => {
-      dispatch(removeLayerFromLayerList(id));
-    });
+    const isMapReady = getMapReady(getState());
+    if (!isMapReady) {
+      dispatch({
+        type: CLEAR_WAITING_FOR_MAP_READY_LAYER_LIST,
+      });
+    } else {
+      getLayerListRaw(getState()).forEach(({ id }) => {
+        dispatch(removeLayerFromLayerList(id));
+      });
+    }
 
     newLayerList.forEach(layerDescriptor => {
       dispatch(addLayer(layerDescriptor));