remove isDataSyncActive

elastic · Apr 9, 2020 · 673d52b · 673d52b
1 parent b13a957
commit 673d52b
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 38 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
@@ -19,7 +19,6 @@ import {
   getOpenTooltips,
   getQuery,
   getDataRequestDescriptor,
-  getLayerSyncDataToken,
 } from '../selectors/map_selectors';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FLYOUT_STATE } from '../../../../../plugins/maps/public/reducers/ui';
@@ -60,7 +59,6 @@ import {
   UPDATE_LAYER_PROP,
   UPDATE_LAYER_STYLE,
   SET_LAYER_STYLE_META,
-  SET_LAYER_SYNC_DATA_TOKEN,
   UPDATE_SOURCE_PROP,
   SET_REFRESH_CONFIG,
   SET_MOUSE_COORDINATES,
@@ -86,13 +84,6 @@ import {
 export * from '../../../../../plugins/maps/public/actions/map_actions';
 
 function getLayerLoadingCallbacks(dispatch, getState, layerId) {
-  const syncToken = Symbol();
-  dispatch({
-    type: SET_LAYER_SYNC_DATA_TOKEN,
-    layerId,
-    syncToken,
-  });
-
   return {
     startLoading: (dataId, requestToken, meta) =>
       dispatch(startDataLoad(layerId, dataId, requestToken, meta)),
@@ -103,15 +94,6 @@ function getLayerLoadingCallbacks(dispatch, getState, layerId) {
     updateSourceData: newData => {
       dispatch(updateSourceDataRequest(layerId, newData));
     },
-    // Check to ensure data syncing action for layer is still active.
-    // Async actions may occur before startLoading is called.
-    // Use isDataSyncActive to check that the data sync is still active before startLoading is called for each data request.
-    isDataSyncActive: () => {
-      const currentToken = getLayerSyncDataToken(getState(), layerId);
-      return currentToken === syncToken;
-    },
-    // Check to ensure single data request for layer is still active.
-    // Use isRequestStillActive to check that the data request is still active after startLoading has been called.
     isRequestStillActive: (dataId, requestToken) => {
       const dataRequest = getDataRequestDescriptor(getState(), layerId, dataId);
       if (!dataRequest) {

diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -161,11 +161,6 @@ export function getDataRequestDescriptor(state = {}, layerId, dataId) {
   });
 }
 
-export function getLayerSyncDataToken(state = {}, layerId) {
-  const layerDescriptor = getLayerDescriptor(state, layerId);
-  return _.get(layerDescriptor, '__dataSyncToken');
-}
-
 export const getDataFilters = createSelector(
   getMapExtent,
   getMapBuffer,

diff --git a/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts b/x-pack/plugins/maps/common/descriptor_types/descriptor_types.d.ts
@@ -96,7 +96,6 @@ export type JoinDescriptor = {
 };
 
 export type LayerDescriptor = {
-  __dataSyncToken?: symbol;
   __dataRequests?: DataRequestDescriptor[];
   __isInErrorState?: boolean;
   __errorMessage?: string;

diff --git a/x-pack/plugins/maps/public/actions/map_actions.d.ts b/x-pack/plugins/maps/public/actions/map_actions.d.ts
@@ -20,7 +20,6 @@ export type SyncContext = {
   stopLoading(dataId: string, requestToken: symbol, data: unknown, meta: DataMeta): void;
   onLoadError(dataId: string, requestToken: symbol, errorMessage: string): void;
   updateSourceData(newData: unknown): void;
-  isDataSyncActive(): boolean;
   isRequestStillActive(dataId: string, requestToken: symbol): boolean;
   registerCancelCallback(requestToken: symbol, callback: () => void): void;
   dataFilters: MapFilters;

diff --git a/x-pack/plugins/maps/public/actions/map_actions.js b/x-pack/plugins/maps/public/actions/map_actions.js
@@ -26,7 +26,6 @@ export const TRIGGER_REFRESH_TIMER = 'TRIGGER_REFRESH_TIMER';
 export const UPDATE_LAYER_PROP = 'UPDATE_LAYER_PROP';
 export const UPDATE_LAYER_STYLE = 'UPDATE_LAYER_STYLE';
 export const SET_LAYER_STYLE_META = 'SET_LAYER_STYLE_META';
-export const SET_LAYER_SYNC_DATA_TOKEN = 'SET_LAYER_SYNC_DATA_TOKEN';
 export const UPDATE_SOURCE_PROP = 'UPDATE_SOURCE_PROP';
 export const SET_REFRESH_CONFIG = 'SET_REFRESH_CONFIG';
 export const SET_MOUSE_COORDINATES = 'SET_MOUSE_COORDINATES';

diff --git a/x-pack/plugins/maps/public/layers/vector_layer.js b/x-pack/plugins/maps/public/layers/vector_layer.js
@@ -230,7 +230,6 @@ export class VectorLayer extends AbstractLayer {
 
   async _syncJoin({
     join,
-    isDataSyncActive,
     startLoading,
     stopLoading,
     onLoadError,
@@ -253,8 +252,7 @@ export class VectorLayer extends AbstractLayer {
       prevDataRequest,
       nextMeta: searchFilters,
     });
-
-    if (canSkipFetch || !isDataSyncActive()) {
+    if (canSkipFetch) {
       return {
         dataHasChanged: false,
         join: join,
@@ -362,7 +360,6 @@ export class VectorLayer extends AbstractLayer {
       onLoadError,
       registerCancelCallback,
       dataFilters,
-      isDataSyncActive,
       isRequestStillActive,
     } = syncContext;
     const dataRequestId = SOURCE_DATA_ID_ORIGIN;
@@ -374,8 +371,7 @@ export class VectorLayer extends AbstractLayer {
       prevDataRequest,
       nextMeta: searchFilters,
     });
-
-    if (canSkipFetch || !isDataSyncActive()) {
+    if (canSkipFetch) {
       return {
         refreshed: false,
         featureCollection: prevDataRequest.getData(),
@@ -462,7 +458,6 @@ export class VectorLayer extends AbstractLayer {
     startLoading,
     stopLoading,
     onLoadError,
-    isDataSyncActive,
     registerCancelCallback,
   }) {
     if (!source.isESSource() || dynamicStyleProps.length === 0) {
@@ -481,8 +476,7 @@ export class VectorLayer extends AbstractLayer {
     };
     const prevDataRequest = this.getDataRequest(dataRequestId);
     const canSkipFetch = canSkipStyleMetaUpdate({ prevDataRequest, nextMeta });
-
-    if (canSkipFetch || !isDataSyncActive()) {
+    if (canSkipFetch) {
       return;
     }
 

diff --git a/x-pack/plugins/maps/public/reducers/map.js b/x-pack/plugins/maps/public/reducers/map.js
@@ -24,7 +24,6 @@ import {
   UPDATE_LAYER_PROP,
   UPDATE_LAYER_STYLE,
   SET_LAYER_STYLE_META,
-  SET_LAYER_SYNC_DATA_TOKEN,
   SET_JOINS,
   UPDATE_SOURCE_PROP,
   SET_REFRESH_CONFIG,
@@ -324,8 +323,6 @@ export function map(state = INITIAL_STATE, action) {
         ...state.layerList[index].style,
         __styleMeta: styleMeta,
       });
-    case SET_LAYER_SYNC_DATA_TOKEN:
-      return updateLayerInList(state, action.layerId, '__dataSyncToken', action.syncToken);
     case SET_SCROLL_ZOOM:
       return {
         ...state,