[Maps] add Top term aggregation (#57875)

* [Maps] add Top term aggregation * update pew-pew source to handle terms agg * make helper function for pulling values from bucket * update terms source * better join labels * categoricla meta * remove unused constant * remove unused changes * remove unused constant METRIC_SCHEMA_CONFIG * update jest expect * fix auto complete suggestions for top term * get category autocomplete working with style props from joins * pluck categorical style meta with real field name * mock MetricsEditor to fix jest test * review feedback * es_agg_utils.js to es_agg_utils.ts * typing updates * use composit agg to avoid search.buckets limit * i18n update and functional test fix * stop paging through results when request is aborted * remove unused file * do not use composite agg when no terms sub-aggregations * clean up * pass indexPattern to getValueAggsDsl * review feedback * more review feedback * ts-ignore for untyped imports in tests * more review feedback * add bucket.hasOwnProperty check Co-authored-by: Elastic Machine <[email protected]>
elastic · Feb 26, 2020 · 3212754 · 3212754
1 parent 2ea4bdf
commit 3212754
Show file tree

Hide file tree

Showing 35 changed files with 726 additions and 416 deletions.
diff --git a/x-pack/legacy/plugins/maps/common/constants.ts b/x-pack/legacy/plugins/maps/common/constants.ts
@@ -117,16 +117,16 @@ export const DRAW_TYPE = {
   POLYGON: 'POLYGON',
 };
 
-export const METRIC_TYPE = {
+export const AGG_TYPE = {
   AVG: 'avg',
   COUNT: 'count',
   MAX: 'max',
   MIN: 'min',
   SUM: 'sum',
+  TERMS: 'terms',
   UNIQUE_COUNT: 'cardinality',
 };
 
-export const COUNT_AGG_TYPE = METRIC_TYPE.COUNT;
 export const COUNT_PROP_LABEL = i18n.translate('xpack.maps.aggs.defaultCountLabel', {
   defaultMessage: 'count',
 });

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,6 +18,7 @@ import {
   getTransientLayerId,
   getOpenTooltips,
   getQuery,
+  getDataRequestDescriptor,
 } from '../selectors/map_selectors';
 import { FLYOUT_STATE } from '../reducers/ui';
 import {
@@ -76,7 +77,7 @@ export const HIDE_LAYER_CONTROL = 'HIDE_LAYER_CONTROL';
 export const HIDE_VIEW_CONTROL = 'HIDE_VIEW_CONTROL';
 export const SET_WAITING_FOR_READY_HIDDEN_LAYERS = 'SET_WAITING_FOR_READY_HIDDEN_LAYERS';
 
-function getLayerLoadingCallbacks(dispatch, layerId) {
+function getLayerLoadingCallbacks(dispatch, getState, layerId) {
   return {
     startLoading: (dataId, requestToken, meta) =>
       dispatch(startDataLoad(layerId, dataId, requestToken, meta)),
@@ -87,6 +88,13 @@ function getLayerLoadingCallbacks(dispatch, layerId) {
     updateSourceData: newData => {
       dispatch(updateSourceDataRequest(layerId, newData));
     },
+    isRequestStillActive: (dataId, requestToken) => {
+      const dataRequest = getDataRequestDescriptor(getState(), layerId, dataId);
+      if (!dataRequest) {
+        return false;
+      }
+      return dataRequest.dataRequestToken === requestToken;
+    },
     registerCancelCallback: (requestToken, callback) =>
       dispatch(registerCancelCallback(requestToken, callback)),
   };
@@ -98,11 +106,11 @@ function getLayerById(layerId, state) {
   });
 }
 
-async function syncDataForAllLayers(getState, dispatch, dataFilters) {
+async function syncDataForAllLayers(dispatch, getState, dataFilters) {
   const state = getState();
   const layerList = getLayerList(state);
   const syncs = layerList.map(layer => {
-    const loadingFunctions = getLayerLoadingCallbacks(dispatch, layer.getId());
+    const loadingFunctions = getLayerLoadingCallbacks(dispatch, getState, layer.getId());
     return layer.syncData({ ...loadingFunctions, dataFilters });
   });
   await Promise.all(syncs);
@@ -412,7 +420,7 @@ export function mapExtentChanged(newMapConstants) {
       },
     });
     const newDataFilters = { ...dataFilters, ...newMapConstants };
-    await syncDataForAllLayers(getState, dispatch, newDataFilters);
+    await syncDataForAllLayers(dispatch, getState, newDataFilters);
   };
 }
 
@@ -653,7 +661,7 @@ export function syncDataForLayer(layerId) {
     const targetLayer = getLayerById(layerId, getState());
     if (targetLayer) {
       const dataFilters = getDataFilters(getState());
-      const loadingFunctions = getLayerLoadingCallbacks(dispatch, layerId);
+      const loadingFunctions = getLayerLoadingCallbacks(dispatch, getState, layerId);
       await targetLayer.syncData({
         ...loadingFunctions,
         dataFilters,
@@ -773,7 +781,7 @@ export function setQuery({ query, timeFilters, filters = [], refresh = false })
     });
 
     const dataFilters = getDataFilters(getState());
-    await syncDataForAllLayers(getState, dispatch, dataFilters);
+    await syncDataForAllLayers(dispatch, getState, dataFilters);
   };
 }
 
@@ -792,7 +800,7 @@ export function triggerRefreshTimer() {
     });
 
     const dataFilters = getDataFilters(getState());
-    await syncDataForAllLayers(getState, dispatch, dataFilters);
+    await syncDataForAllLayers(dispatch, getState, dataFilters);
   };
 }
 

diff --git a/x-pack/legacy/plugins/maps/public/components/metric_editor.js b/x-pack/legacy/plugins/maps/public/components/metric_editor.js
@@ -12,17 +12,16 @@ import { EuiFieldText, EuiFormRow } from '@elastic/eui';
 
 import { MetricSelect, METRIC_AGGREGATION_VALUES } from './metric_select';
 import { SingleFieldSelect } from './single_field_select';
-import { METRIC_TYPE } from '../../common/constants';
+import { AGG_TYPE } from '../../common/constants';
+import { getTermsFields } from '../index_pattern_util';
 
 function filterFieldsForAgg(fields, aggType) {
   if (!fields) {
     return [];
   }
 
-  if (aggType === METRIC_TYPE.UNIQUE_COUNT) {
-    return fields.filter(field => {
-      return field.aggregatable;
-    });
+  if (aggType === AGG_TYPE.UNIQUE_COUNT || aggType === AGG_TYPE.TERMS) {
+    return getTermsFields(fields);
   }
 
   return fields.filter(field => {
@@ -38,7 +37,7 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
     };
 
     // unset field when new agg type does not support currently selected field.
-    if (metric.field && metricAggregationType !== METRIC_TYPE.COUNT) {
+    if (metric.field && metricAggregationType !== AGG_TYPE.COUNT) {
       const fieldsForNewAggType = filterFieldsForAgg(fields, metricAggregationType);
       const found = fieldsForNewAggType.find(field => {
         return field.name === metric.field;
@@ -64,7 +63,7 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
   };
 
   let fieldSelect;
-  if (metric.type && metric.type !== METRIC_TYPE.COUNT) {
+  if (metric.type && metric.type !== AGG_TYPE.COUNT) {
     fieldSelect = (
       <EuiFormRow
         label={i18n.translate('xpack.maps.metricsEditor.selectFieldLabel', {

diff --git a/x-pack/legacy/plugins/maps/public/components/metric_select.js b/x-pack/legacy/plugins/maps/public/components/metric_select.js
@@ -8,44 +8,50 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBox } from '@elastic/eui';
-import { METRIC_TYPE } from '../../common/constants';
+import { AGG_TYPE } from '../../common/constants';
 
 const AGG_OPTIONS = [
   {
     label: i18n.translate('xpack.maps.metricSelect.averageDropDownOptionLabel', {
       defaultMessage: 'Average',
     }),
-    value: METRIC_TYPE.AVG,
+    value: AGG_TYPE.AVG,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.countDropDownOptionLabel', {
       defaultMessage: 'Count',
     }),
-    value: METRIC_TYPE.COUNT,
+    value: AGG_TYPE.COUNT,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.maxDropDownOptionLabel', {
       defaultMessage: 'Max',
     }),
-    value: METRIC_TYPE.MAX,
+    value: AGG_TYPE.MAX,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.minDropDownOptionLabel', {
       defaultMessage: 'Min',
     }),
-    value: METRIC_TYPE.MIN,
+    value: AGG_TYPE.MIN,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.sumDropDownOptionLabel', {
       defaultMessage: 'Sum',
     }),
-    value: METRIC_TYPE.SUM,
+    value: AGG_TYPE.SUM,
+  },
+  {
+    label: i18n.translate('xpack.maps.metricSelect.termsDropDownOptionLabel', {
+      defaultMessage: 'Top term',
+    }),
+    value: AGG_TYPE.TERMS,
   },
   {
     label: i18n.translate('xpack.maps.metricSelect.cardinalityDropDownOptionLabel', {
       defaultMessage: 'Unique count',
     }),
-    value: METRIC_TYPE.UNIQUE_COUNT,
+    value: AGG_TYPE.UNIQUE_COUNT,
   },
 ];
 

diff --git a/x-pack/legacy/plugins/maps/public/components/metrics_editor.js b/x-pack/legacy/plugins/maps/public/components/metrics_editor.js
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButtonEmpty, EuiSpacer, EuiTextAlign } from '@elastic/eui';
 import { MetricEditor } from './metric_editor';
-import { METRIC_TYPE } from '../../common/constants';
+import { AGG_TYPE } from '../../common/constants';
 
 export function MetricsEditor({ fields, metrics, onChange, allowMultipleMetrics, metricsFilter }) {
   function renderMetrics() {
@@ -100,6 +100,6 @@ MetricsEditor.propTypes = {
 };
 
 MetricsEditor.defaultProps = {
-  metrics: [{ type: METRIC_TYPE.COUNT }],
+  metrics: [{ type: AGG_TYPE.COUNT }],
   allowMultipleMetrics: true,
 };
diff --git a/.../maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js b/.../maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { MetricsEditor } from '../../../../components/metrics_editor';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { METRIC_TYPE } from '../../../../../common/constants';
+import { AGG_TYPE } from '../../../../../common/constants';
 
 export class MetricsExpression extends Component {
   state = {
@@ -59,7 +59,7 @@ export class MetricsExpression extends Component {
   render() {
     const metricExpressions = this.props.metrics
       .filter(({ type, field }) => {
-        if (type === METRIC_TYPE.COUNT) {
+        if (type === AGG_TYPE.COUNT) {
           return true;
         }
 
@@ -70,7 +70,7 @@ export class MetricsExpression extends Component {
       })
       .map(({ type, field }) => {
         // do not use metric label so field and aggregation are not obscured.
-        if (type === METRIC_TYPE.COUNT) {
+        if (type === AGG_TYPE.COUNT) {
           return 'count';
         }
 
@@ -130,5 +130,5 @@ MetricsExpression.propTypes = {
 };
 
 MetricsExpression.defaultProps = {
-  metrics: [{ type: METRIC_TYPE.COUNT }],
+  metrics: [{ type: AGG_TYPE.COUNT }],
 };
diff --git a/.../public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js b/.../public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js
@@ -4,6 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+jest.mock('../../../../components/metrics_editor', () => ({
+  MetricsEditor: () => {
+    return <div>mockMetricsEditor</div>;
+  },
+}));
+
 import React from 'react';
 import { shallow } from 'enzyme';
 import { MetricsExpression } from './metrics_expression';

diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
@@ -23,6 +23,7 @@ import sprites1 from '@elastic/maki/dist/[email protected]';
 import sprites2 from '@elastic/maki/dist/[email protected]';
 import { DrawControl } from './draw_control';
 import { TooltipControl } from './tooltip_control';
+import { clampToLatBounds, clampToLonBounds } from '../../../elasticsearch_geo_utils';
 
 mapboxgl.workerUrl = mbWorkerUrl;
 mapboxgl.setRTLTextPlugin(mbRtlPlugin);
@@ -234,12 +235,12 @@ export class MBMapContainer extends React.Component {
       //clamping ot -89/89 latitudes since Mapboxgl does not seem to handle bounds that contain the poles (logs errors to the console when using -90/90)
       const lnLatBounds = new mapboxgl.LngLatBounds(
         new mapboxgl.LngLat(
-          clamp(goto.bounds.min_lon, -180, 180),
-          clamp(goto.bounds.min_lat, -89, 89)
+          clampToLonBounds(goto.bounds.min_lon),
+          clampToLatBounds(goto.bounds.min_lat)
         ),
         new mapboxgl.LngLat(
-          clamp(goto.bounds.max_lon, -180, 180),
-          clamp(goto.bounds.max_lat, -89, 89)
+          clampToLonBounds(goto.bounds.max_lon),
+          clampToLatBounds(goto.bounds.max_lat)
         )
       );
       //maxZoom ensure we're not zooming in too far on single points or small shapes
@@ -306,9 +307,3 @@ export class MBMapContainer extends React.Component {
     );
   }
 }
-
-function clamp(val, min, max) {
-  if (val > max) val = max;
-  else if (val < min) val = min;
-  return val;
-}
diff --git a/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.js b/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.js
@@ -433,3 +433,21 @@ export function convertMapExtentToPolygon({ maxLat, maxLon, minLat, minLon }) {
 
   return formatEnvelopeAsPolygon({ maxLat, maxLon, minLat, minLon });
 }
+
+export function clampToLatBounds(lat) {
+  return clamp(lat, -89, 89);
+}
+
+export function clampToLonBounds(lon) {
+  return clamp(lon, -180, 180);
+}
+
+export function clamp(val, min, max) {
+  if (val > max) {
+    return max;
+  } else if (val < min) {
+    return min;
+  } else {
+    return val;
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/es_agg_field.js b/x-pack/legacy/plugins/maps/public/layers/fields/es_agg_field.js
@@ -5,9 +5,10 @@
  */
 
 import { AbstractField } from './field';
-import { COUNT_AGG_TYPE } from '../../../common/constants';
+import { AGG_TYPE } from '../../../common/constants';
 import { isMetricCountable } from '../util/is_metric_countable';
 import { ESAggMetricTooltipProperty } from '../tooltips/es_aggmetric_tooltip_property';
+import { getField, addFieldToDSL } from '../util/es_agg_utils';
 
 export class ESAggMetricField extends AbstractField {
   static type = 'ES_AGG';
@@ -34,22 +35,21 @@ export class ESAggMetricField extends AbstractField {
   }
 
   isValid() {
-    return this.getAggType() === COUNT_AGG_TYPE ? true : !!this._esDocField;
+    return this.getAggType() === AGG_TYPE.COUNT ? true : !!this._esDocField;
   }
 
   async getDataType() {
-    // aggregations only provide numerical data
-    return 'number';
+    return this.getAggType() === AGG_TYPE.TERMS ? 'string' : 'number';
   }
 
   getESDocFieldName() {
     return this._esDocField ? this._esDocField.getName() : '';
   }
 
   getRequestDescription() {
-    return this.getAggType() !== COUNT_AGG_TYPE
+    return this.getAggType() !== AGG_TYPE.COUNT
       ? `${this.getAggType()} ${this.getESDocFieldName()}`
-      : COUNT_AGG_TYPE;
+      : AGG_TYPE.COUNT;
   }
 
   async createTooltipProperty(value) {
@@ -63,18 +63,13 @@ export class ESAggMetricField extends AbstractField {
     );
   }
 
-  makeMetricAggConfig() {
-    const metricAggConfig = {
-      id: this.getName(),
-      enabled: true,
-      type: this.getAggType(),
-      schema: 'metric',
-      params: {},
+  getValueAggDsl(indexPattern) {
+    const field = getField(indexPattern, this.getESDocFieldName());
+    const aggType = this.getAggType();
+    const aggBody = aggType === AGG_TYPE.TERMS ? { size: 1, shard_size: 1 } : {};
+    return {
+      [aggType]: addFieldToDSL(aggBody, field),
     };
-    if (this.getAggType() !== COUNT_AGG_TYPE) {
-      metricAggConfig.params = { field: this.getESDocFieldName() };
-    }
-    return metricAggConfig;
   }
 
   supportsFieldMeta() {
@@ -85,4 +80,8 @@ export class ESAggMetricField extends AbstractField {
   async getOrdinalFieldMetaRequest(config) {
     return this._esDocField.getOrdinalFieldMetaRequest(config);
   }
+
+  async getCategoricalFieldMetaRequest() {
+    return this._esDocField.getCategoricalFieldMetaRequest();
+  }
 }