[Lens] Create a filter with field:value when last value metric is use…

…d on a datatable

src/plugins/data/common/search/aggs/metrics/filtered_metric.test.ts

@@ -7,25 +7,36 @@
  */
 
 import { AggConfigs, IAggConfigs } from '../agg_configs';
-import { mockAggTypesRegistry } from '../test_helpers';
+import { AggTypesDependencies } from '../agg_types';
+import { mockAggTypesDependencies, mockAggTypesRegistry } from '../test_helpers';
+import { getFilteredMetricAgg } from './filtered_metric';
+import { IMetricAggConfig } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
 
 describe('filtered metric agg type', () => {
  let aggConfigs: IAggConfigs;
+ let aggTypesDependencies: AggTypesDependencies;
+ const typesRegistry = mockAggTypesRegistry();
+ const field = {
+ name: 'bytes',
+ filterable: true,
+ };
+ const indexPattern = {
+ id: '1234',
+ title: 'logstash-*',
+ fields: {
+ getByName: () => field,
+ filter: () => [field],
+ find: () => field,
+ },
+ } as any;
 
  beforeEach(() => {
- const typesRegistry = mockAggTypesRegistry();
- const field = {
- name: 'bytes',
+ jest.resetAllMocks();
+ aggTypesDependencies = {
+ ...mockAggTypesDependencies,
+ getConfig: jest.fn(),
  };
- const indexPattern = {
- id: '1234',
- title: 'logstash-*',
- fields: {
- getByName: () => field,
- filter: () => [field],
- },
- } as any;
 
  aggConfigs = new AggConfigs(
  indexPattern,
@@ -76,4 +87,62 @@ describe('filtered metric agg type', () => {
 
  expect(agg.getResponseId()).toEqual('filtered_metric-bucket');
  });
+ it('returns phrase filter for filtered metric on top metrics', () => {
+ const topMetricsAggConfigs = new AggConfigs(
+ indexPattern,
+ [
+ {
+ id: METRIC_TYPES.FILTERED_METRIC,
+ type: METRIC_TYPES.FILTERED_METRIC,
+ schema: 'metric',
+ params: {
+ customBucket: {
+ type: 'filter',
+ params: {
+ filter: { language: 'kuery', query: 'a: b' },
+ },
+ },
+ customMetric: {
+ type: 'top_metrics',
+ params: {
+ field: 'bytes',
+ },
+ },
+ },
+ },
+ ],
+ {
+ typesRegistry,
+ },
+ jest.fn()
+ );
+
+ expect(
+ getFilteredMetricAgg(aggTypesDependencies).createFilter!(
+ topMetricsAggConfigs.aggs[0] as IMetricAggConfig,
+ 10
+ )
+ ).toEqual({
+ meta: { index: '1234' },
+ query: { match_phrase: { bytes: 10 } },
+ });
+ });
+ it('returns filter from the custom bucket filter parameter for metric', () => {
+ expect(
+ getFilteredMetricAgg(aggTypesDependencies).createFilter!(
+ aggConfigs.aggs[0] as IMetricAggConfig,
+ '10'
+ )
+ ).toEqual({
+ query: {
+ bool: {
+ must: [],
+ filter: [{ bool: { should: [{ match: { bytes: 'b' } }], minimum_should_match: 1 } }],
+ should: [],
+ must_not: [],
+ },
+ },
+ meta: { index: '1234', alias: 'a: b' },
+ });
+ });
 });

src/plugins/data/common/search/aggs/metrics/filtered_metric.ts

@@ -51,16 +51,19 @@ export const getFilteredMetricAgg = ({ getConfig }: FiltersMetricAggDependencies
  hasNoDslParams: true,
  getSerializedFormat,
  createFilter: (agg, inputState) => {
+ const indexPattern = agg.getIndexPattern();
+ if (!indexPattern) return;
+ if (
+ agg.params.customMetric.type.name === 'top_hits' ||
+ agg.params.customMetric.type.name === 'top_metrics'
+ ) {
+ return agg.params.customMetric.createFilter(inputState);
+ }
  if (!agg.params.customBucket.params.filter) return;
  const esQueryConfigs = getEsQueryConfig({ get: getConfig });
  return buildQueryFilter(
- buildEsQuery(
- agg.getIndexPattern(),
- [agg.params.customBucket.params.filter],
- [],
- esQueryConfigs
- ),
- agg.getIndexPattern().id!,
+ buildEsQuery(indexPattern, [agg.params.customBucket.params.filter], [], esQueryConfigs),
+ indexPattern.id!,
  agg.params.customBucket.params.filter.query
  );
  },

src/plugins/data/common/search/aggs/metrics/top_hit.test.ts

@@ -402,5 +402,11 @@ describe('Top hit metric', () => {
  });
  });
  });
+ it('returns phrase filter', () => {
+ expect(getTopHitMetricAgg().createFilter!(aggConfig, '10')).toEqual({
+ meta: { index: '1234' },
+ query: { match_phrase: { bytes: 10 } },
+ });
+ });
  });
 });

src/plugins/data/common/search/aggs/metrics/top_hit.ts

@@ -9,6 +9,7 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { DataViewField } from '@kbn/data-views-plugin/common';
+import { buildPhraseFilter } from '@kbn/es-query';
 import { aggTopHitFnName } from './top_hit_fn';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
@@ -256,5 +257,11 @@ export const getTopHitMetricAgg = () => {
  }
  return values;
  },
+ createFilter: (agg, key) => {
+ const field = agg.getField();
+ if (field) {
+ return buildPhraseFilter(field, key, agg.getIndexPattern());
+ }
+ },
  });
 };

src/plugins/data/common/search/aggs/metrics/top_metrics.test.ts

@@ -191,5 +191,11 @@ describe('Top metrics metric', () => {
  init({ fieldName: 'bytes' });
  expect(getTopMetricsMetricAgg().getValue(aggConfig, bucket)).toEqual([1024, 512, 256]);
  });
+ it('returns phrase filter', () => {
+ expect(getTopMetricsMetricAgg().createFilter!(aggConfig, '10')).toEqual({
+ meta: { index: '1234' },
+ query: { match_phrase: { bytes: 10 } },
+ });
+ });
  });
 });

src/plugins/data/common/search/aggs/metrics/top_metrics.ts

@@ -9,6 +9,7 @@
 import _ from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
+import { buildPhraseFilter } from '@kbn/es-query';
 import { aggTopMetricsFnName } from './top_metrics_fn';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
 import { METRIC_TYPES } from './metric_agg_types';
@@ -162,5 +163,11 @@ export const getTopMetricsMetricAgg = () => {
  if (results.length === 1) return results[0];
  return results;
  },
+ createFilter: (agg, key) => {
+ const field = agg.getField();
+ if (field) {
+ return buildPhraseFilter(field, key, agg.getIndexPattern());
+ }
+ },
  });
 };