[Maps] Support categorical styling for numbers and dates

x-pack/legacy/plugins/maps/common/constants.ts

@@ -165,6 +165,7 @@ export const COLOR_MAP_TYPE = {
 export const COLOR_PALETTE_MAX_SIZE = 10;
 
 export const CATEGORICAL_DATA_TYPES = ['string', 'ip', 'boolean'];
+export const ORDINAL_DATA_TYPES = ['number', 'date'];
 
 export const SYMBOLIZE_AS_TYPES = {
   CIRCLE: 'circle',

x-pack/legacy/plugins/maps/public/layers/fields/es_doc_field.js

@@ -57,11 +57,6 @@ export class ESDocField extends AbstractField {
 
   async getCategoricalFieldMetaRequest() {
     const field = await this._getField();
-    if (field.type !== 'string') {
-      //UX does not support categorical styling for number/date fields
-      return null;
-    }
-
     const topTerms = {
       size: COLOR_PALETTE_MAX_SIZE - 1, //need additional color for the "other"-value
     };

x-pack/legacy/plugins/maps/public/layers/layer.js

@@ -332,18 +332,6 @@ export class AbstractLayer {
     return [];
   }
 
-  async getDateFields() {
-    return [];
-  }
-
-  async getNumberFields() {
-    return [];
-  }
-
-  async getCategoricalFields() {
-    return [];
-  }
-
   async getFields() {
     return [];
   }

x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.d.ts

@@ -7,13 +7,16 @@
 import { IESSource } from './es_source';
 import { AbstractESSource } from './es_source';
 import { AGG_TYPE } from '../../../common/constants';
+import { IESAggField } from '../fields/es_agg_field';
 
 export interface IESAggSource extends IESSource {
   getAggKey(aggType: AGG_TYPE, fieldName: string): string;
   getAggLabel(aggType: AGG_TYPE, fieldName: string): string;
+  getMetricFields(): IESAggField[];
 }
 
 export class AbstractESAggSource extends AbstractESSource implements IESAggSource {
   getAggKey(aggType: AGG_TYPE, fieldName: string): string;
   getAggLabel(aggType: AGG_TYPE, fieldName: string): string;
+  getMetricFields(): IESAggField[];
 }

x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.js

@@ -78,6 +78,10 @@ export class AbstractESAggSource extends AbstractESSource {
     }
   }
 
+  async getFields() {
+    return this.getMetricFields();
+  }
+
   getValueAggsDsl(indexPattern) {
     const valueAggsDsl = {};
     this.getMetricFields().forEach(esAggMetric => {
@@ -89,10 +93,6 @@ export class AbstractESAggSource extends AbstractESSource {
     return valueAggsDsl;
   }
 
-  async getNumberFields() {
-    return this.getMetricFields();
-  }
-
   async filterAndFormatPropertiesToHtmlForMetricFields(properties) {
     const metricFields = this.getMetricFields();
     const tooltipPropertiesPromises = [];

x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.test.ts

@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+jest.mock('../../../kibana_services', () => {});
+jest.mock('ui/new_platform');
+
+import { ESGeoGridSource } from './es_geo_grid_source';
+import { AGG_TYPE, ES_GEO_GRID, GRID_RESOLUTION, RENDER_AS } from '../../../../common/constants';
+import { IField } from '../../fields/field';
+
+describe('ESGeoGridSource', () => {
+  const metricExamples = [
+    {
+      type: AGG_TYPE.SUM,
+      field: 'myFieldGettingSummed',
+      label: 'my custom label',
+    },
+    {
+      // metric config is invalid beause field is missing
+      type: AGG_TYPE.MAX,
+    },
+    {
+      // metric config is valid because "count" metric does not need to provide field
+      type: AGG_TYPE.COUNT,
+      label: '', // should ignore empty label fields
+    },
+  ];
+
+  const geogridSource = new ESGeoGridSource(
+    {
+      id: 'foobar',
+      indexPatternId: 'fooIp',
+      geoField: 'bar',
+      metrics: metricExamples,
+      resolution: GRID_RESOLUTION.COARSE,
+      type: ES_GEO_GRID,
+      requestType: RENDER_AS.HEATMAP,
+    },
+    {}
+  );
+
+  const getFieldMeta = async (field: IField) => {
+    return {
+      field: field.getName(),
+      label: await field.getLabel(),
+      type: await field.getDataType(),
+    };
+  };
+
+  it('getMetricFields should remove incomplete metric aggregations. Smaller tests t', async () => {
+    const fields = await geogridSource.getFields();
+    const fieldsMeta = await Promise.all(fields.map(getFieldMeta));
+    expect(
+      _.isEqual(fieldsMeta, [
+        {
+          type: 'number',
+          field: 'sum_of_myFieldGettingSummed',
+          label: 'my custom label',
+        },
+        {
+          type: 'number',
+          label: 'count',
+          field: 'doc_count',
+        },
+      ])
+    ).toEqual(true);
+  });
+
+  it('getFields should return getMetricFields', async () => {
+    const fields = await geogridSource.getFields();
+    const metrics = await geogridSource.getMetricFields();
+    const fieldsMeta = await Promise.all(fields.map(getFieldMeta));
+    const metricFieldsMeta = await Promise.all(metrics.map(getFieldMeta));
+
+    expect(_.isEqual(fieldsMeta, metricFieldsMeta)).toEqual(true);
+  });
+});

x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js

@@ -19,7 +19,6 @@ import {
   ES_GEO_FIELD_TYPE,
   DEFAULT_MAX_BUCKETS_LIMIT,
   SORT_ORDER,
-  CATEGORICAL_DATA_TYPES,
 } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
@@ -135,49 +134,6 @@ export class ESSearchSource extends AbstractESSource {
     );
   }
 
-  async getNumberFields() {
-    try {
-      const indexPattern = await this.getIndexPattern();
-      return indexPattern.fields.getByType('number').map(field => {
-        return this.createField({ fieldName: field.name });
-      });
-    } catch (error) {
-      return [];
-    }
-  }
-
-  async getDateFields() {
-    try {
-      const indexPattern = await this.getIndexPattern();
-      return indexPattern.fields.getByType('date').map(field => {
-        return this.createField({ fieldName: field.name });
-      });
-    } catch (error) {
-      return [];
-    }
-  }
-
-  async getCategoricalFields() {
-    try {
-      const indexPattern = await this.getIndexPattern();
-
-      const aggFields = [];
-      CATEGORICAL_DATA_TYPES.forEach(dataType => {
-        indexPattern.fields.getByType(dataType).forEach(field => {
-          if (field.aggregatable) {
-            aggFields.push(field);
-          }
-        });
-      });
-      return aggFields.map(field => {
-        return this.createField({ fieldName: field.name });
-      });
-    } catch (error) {
-      //error surfaces in the LayerTOC UI
-      return [];
-    }
-  }
-
   async getFields() {
     try {
       const indexPattern = await this.getIndexPattern();

x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js

@@ -5,6 +5,7 @@
  */
 
 import { ESTermSource, extractPropertiesMap } from './es_term_source';
+import _ from 'lodash';
 
 jest.mock('ui/new_platform');
 jest.mock('../vector_layer', () => {});
@@ -64,6 +65,30 @@ describe('getMetricFields', () => {
     expect(metrics[1].getName()).toEqual('__kbnjoin__count_groupby_myIndex.myTermField');
     expect(await metrics[1].getLabel()).toEqual('Count of myIndex');
   });
+
+  it('should match getFields since term_source is agg_source', async () => {
+    const source = new ESTermSource({
+      indexPatternTitle: indexPatternTitle,
+      term: termFieldName,
+      metrics: metricExamples,
+    });
+    const metrics = source.getMetricFields();
+    const fields = await source.getFields();
+
+    const getFieldMeta = async field => {
+      return {
+        aggType: field.getAggType(),
+        name: field.getName(),
+        label: await field.getLabel(),
+        esDoc: field.getRootName(),
+      };
+    };
+
+    const metricsFieldMeta = await Promise.all(metrics.map(getFieldMeta));
+    const fieldsFieldMeta = await Promise.all(fields.map(getFieldMeta));
+
+    expect(_.isEqual(metricsFieldMeta, fieldsFieldMeta)).toEqual(true);
+  });
 });
 
 describe('extractPropertiesMap', () => {

x-pack/legacy/plugins/maps/public/layers/sources/vector_source.js

@@ -111,19 +111,7 @@ export class AbstractVectorSource extends AbstractSource {
     return null;
   }
 
-  async getDateFields() {
-    return [];
-  }
-
-  async getNumberFields() {
-    return [];
-  }
-
   async getFields() {
-    return [...(await this.getDateFields()), ...(await this.getNumberFields())];
-  }
-
-  async getCategoricalFields() {
     return [];
   }