more review feedback

elastic · Feb 26, 2020 · 122491a · 122491a
1 parent ac8c04b
commit 122491a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 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
@@ -18,7 +18,7 @@ import {
   getTransientLayerId,
   getOpenTooltips,
   getQuery,
-  getDataRequest,
+  getDataRequestDescriptor,
 } from '../selectors/map_selectors';
 import { FLYOUT_STATE } from '../reducers/ui';
 import {
@@ -89,7 +89,7 @@ function getLayerLoadingCallbacks(dispatch, getState, layerId) {
       dispatch(updateSourceDataRequest(layerId, newData));
     },
     isRequestStillActive: (dataId, requestToken) => {
-      const dataRequest = getDataRequest(getState(), layerId, dataId);
+      const dataRequest = getDataRequestDescriptor(getState(), layerId, dataId);
       if (!dataRequest) {
         return false;
       }

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
@@ -164,7 +164,7 @@ export class ESGeoGridSource extends AbstractESAggSource {
     );
   }
 
-  async compositeAggRequest({
+  async _compositeAggRequest({
     searchSource,
     indexPattern,
     precision,
@@ -254,7 +254,7 @@ export class ESGeoGridSource extends AbstractESAggSource {
 
   // Do not use composite aggregation when there are no terms sub-aggregations
   // see https://github.com/elastic/kibana/pull/57875#issuecomment-590515482 for explanation on using separate code paths
-  async nonCompositeAggRequest({
+  async _nonCompositeAggRequest({
     searchSource,
     indexPattern,
     precision,
@@ -305,14 +305,14 @@ export class ESGeoGridSource extends AbstractESAggSource {
 
     const features =
       bucketsPerGrid === 1
-        ? await this.nonCompositeAggRequest({
+        ? await this._nonCompositeAggRequest({
             searchSource,
             indexPattern,
             precision: searchFilters.geogridPrecision,
             layerName,
             registerCancelCallback,
           })
-        : await this.compositeAggRequest({
+        : await this._compositeAggRequest({
             searchSource,
             indexPattern,
             precision: searchFilters.geogridPrecision,

diff --git a/...s/public/layers/util/es_agg_utils.test.js → ...s/public/layers/util/es_agg_utils.test.ts b/...s/public/layers/util/es_agg_utils.test.js → ...s/public/layers/util/es_agg_utils.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -125,12 +125,12 @@ export const getRefreshConfig = ({ map }) => {
 
 export const getRefreshTimerLastTriggeredAt = ({ map }) => map.mapState.refreshTimerLastTriggeredAt;
 
-export function getLayerDescriptor(state = {}, layerId) {
+function getLayerDescriptor(state = {}, layerId) {
   const layerListRaw = getLayerListRaw(state);
   return layerListRaw.find(layer => layer.id === layerId);
 }
 
-export function getDataRequest(state = {}, layerId, dataId) {
+export function getDataRequestDescriptor(state = {}, layerId, dataId) {
   const layerDescriptor = getLayerDescriptor(state, layerId);
   if (!layerDescriptor || !layerDescriptor.__dataRequests) {
     return;