[Query] Use a minimal index pattern interface for es query

src/plugins/data/common/es_query/es_query/build_es_query.ts

@@ -10,9 +10,9 @@ import { groupBy, has, isEqual } from 'lodash';
 import { buildQueryFromKuery } from './from_kuery';
 import { buildQueryFromFilters } from './from_filters';
 import { buildQueryFromLucene } from './from_lucene';
-import { IIndexPattern } from '../../index_patterns';
 import { Filter } from '../filters';
 import { Query } from '../../query/types';
+import { MinimalIndexPattern } from './types';
 
 export interface EsQueryConfig {
   allowLeadingWildcards: boolean;
@@ -36,7 +36,7 @@ function removeMatchAll<T>(filters: T[]) {
  * config contains dateformat:tz
  */
 export function buildEsQuery(
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: MinimalIndexPattern | undefined,
   queries: Query | Query[],
   filters: Filter | Filter[],
   config: EsQueryConfig = {

src/plugins/data/common/es_query/es_query/filter_matches_index.ts

@@ -6,15 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
 import { Filter } from '../filters';
+import { MinimalIndexPattern } from './types';
 
 /*
  * TODO: We should base this on something better than `filter.meta.key`. We should probably modify
  * this to check if `filter.meta.index` matches `indexPattern.id` instead, but that's a breaking
  * change.
  */
-export function filterMatchesIndex(filter: Filter, indexPattern?: IIndexPattern | null) {
+export function filterMatchesIndex(filter: Filter, indexPattern?: MinimalIndexPattern | null) {
   if (!filter.meta?.key || !indexPattern) {
     return true;
   }

src/plugins/data/common/es_query/es_query/from_filters.ts

@@ -10,7 +10,7 @@ import { isUndefined } from 'lodash';
 import { migrateFilter } from './migrate_filter';
 import { filterMatchesIndex } from './filter_matches_index';
 import { Filter, cleanFilter, isFilterDisabled } from '../filters';
-import { IIndexPattern } from '../../index_patterns';
+import { MinimalIndexPattern } from './types';
 import { handleNestedFilter } from './handle_nested_filter';
 
 /**
@@ -45,7 +45,7 @@ const translateToQuery = (filter: Filter) => {
 
 export const buildQueryFromFilters = (
   filters: Filter[] = [],
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: MinimalIndexPattern | undefined,
   ignoreFilterIfFieldNotInIndex: boolean = false
 ) => {
   filters = filters.filter((filter) => filter && !isFilterDisabled(filter));

src/plugins/data/common/es_query/es_query/from_kuery.ts

@@ -7,11 +7,11 @@
  */
 
 import { fromKueryExpression, toElasticsearchQuery, nodeTypes, KueryNode } from '../kuery';
-import { IIndexPattern } from '../../index_patterns';
+import { MinimalIndexPattern } from './types';
 import { Query } from '../../query/types';
 
 export function buildQueryFromKuery(
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: MinimalIndexPattern | undefined,
   queries: Query[] = [],
   allowLeadingWildcards: boolean = false,
   dateFormatTZ?: string
@@ -24,7 +24,7 @@ export function buildQueryFromKuery(
 }
 
 function buildQuery(
-  indexPattern: IIndexPattern | undefined,
+  indexPattern: MinimalIndexPattern | undefined,
   queryASTs: KueryNode[],
   config: Record<string, any> = {}
 ) {

src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts

@@ -9,13 +9,14 @@
 import { handleNestedFilter } from './handle_nested_filter';
 import { fields } from '../../index_patterns/mocks';
 import { buildPhraseFilter, buildQueryFilter } from '../filters';
-import { IFieldType, IIndexPattern } from '../../index_patterns';
+import { MinimalIndexPattern } from './types';
+import { IFieldType } from '../../index_patterns';
 
 describe('handleNestedFilter', function () {
-  const indexPattern: IIndexPattern = ({
+  const indexPattern: MinimalIndexPattern = {
     id: 'logstash-*',
     fields,
-  } as unknown) as IIndexPattern;
+  };
 
   it("should return the filter's query wrapped in nested query if the target field is nested", () => {
     const field = getField('nestedField.child');

src/plugins/data/common/es_query/es_query/handle_nested_filter.ts

@@ -7,9 +7,9 @@
  */
 
 import { getFilterField, cleanFilter, Filter } from '../filters';
-import { IIndexPattern } from '../../index_patterns';
+import { MinimalIndexPattern } from './types';
 
-export const handleNestedFilter = (filter: Filter, indexPattern?: IIndexPattern) => {
+export const handleNestedFilter = (filter: Filter, indexPattern?: MinimalIndexPattern) => {
   if (!indexPattern) return filter;
 
   const fieldName = getFilterField(filter);

src/plugins/data/common/es_query/es_query/index.ts

@@ -11,3 +11,4 @@ export { buildQueryFromFilters } from './from_filters';
 export { luceneStringToDsl } from './lucene_string_to_dsl';
 export { decorateQuery } from './decorate_query';
 export { getEsQueryConfig } from './get_es_query_config';
+export { MinimalIndexPattern } from './types';

src/plugins/data/common/es_query/es_query/migrate_filter.ts

@@ -9,7 +9,7 @@
 import { get, omit } from 'lodash';
 import { getConvertedValueForField } from '../filters';
 import { Filter } from '../filters';
-import { IIndexPattern } from '../../index_patterns';
+import { MinimalIndexPattern } from './types';
 
 export interface DeprecatedMatchPhraseFilter extends Filter {
   query: {
@@ -28,7 +28,7 @@ function isDeprecatedMatchPhraseFilter(filter: any): filter is DeprecatedMatchPh
   return Boolean(fieldName && get(filter, ['query', 'match', fieldName, 'type']) === 'phrase');
 }
 
-export function migrateFilter(filter: Filter, indexPattern?: IIndexPattern) {
+export function migrateFilter(filter: Filter, indexPattern?: MinimalIndexPattern) {
   if (isDeprecatedMatchPhraseFilter(filter)) {
     const fieldName = Object.keys(filter.query.match)[0];
     const params: Record<string, any> = get(filter, ['query', 'match', fieldName]);

src/plugins/data/common/es_query/es_query/types.ts

@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { IFieldType } from '../../index_patterns';
+
+export interface MinimalIndexPattern {
+  fields: IFieldType[];
+  id?: string;
+}

src/plugins/data/common/es_query/filters/build_filters.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IIndexPattern, IFieldType } from '../..';
+import { IFieldType, MinimalIndexPattern } from '../..';
 import {
   Filter,
   FILTERS,
@@ -19,7 +19,7 @@ import {
 } from '.';
 
 export function buildFilter(
-  indexPattern: IIndexPattern,
+  indexPattern: MinimalIndexPattern,
   field: IFieldType,
   type: FILTERS,
   negate: boolean,
@@ -59,7 +59,7 @@ export function buildCustomFilter(
 }
 
 function buildBaseFilter(
-  indexPattern: IIndexPattern,
+  indexPattern: MinimalIndexPattern,
   field: IFieldType,
   type: FILTERS,
   params: any

src/plugins/data/common/es_query/filters/exists_filter.ts

@@ -7,7 +7,8 @@
  */
 
 import { Filter, FilterMeta } from './meta_filter';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { MinimalIndexPattern } from '..';
 
 export type ExistsFilterMeta = FilterMeta;
 
@@ -26,7 +27,7 @@ export const getExistsFilterField = (filter: ExistsFilter) => {
   return filter.exists && filter.exists.field;
 };
 
-export const buildExistsFilter = (field: IFieldType, indexPattern: IIndexPattern) => {
+export const buildExistsFilter = (field: IFieldType, indexPattern: MinimalIndexPattern) => {
   return {
     meta: {
       index: indexPattern.id,

src/plugins/data/common/es_query/filters/index.ts

@@ -14,10 +14,8 @@ export * from './custom_filter';
 export * from './exists_filter';
 export * from './geo_bounding_box_filter';
 export * from './geo_polygon_filter';
-export * from './get_display_value';
 export * from './get_filter_field';
 export * from './get_filter_params';
-export * from './get_index_pattern_from_filter';
 export * from './match_all_filter';
 export * from './meta_filter';
 export * from './missing_filter';

src/plugins/data/common/es_query/filters/phrase_filter.ts

@@ -8,7 +8,8 @@
 import type { estypes } from '@elastic/elasticsearch';
 import { get, isPlainObject } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { MinimalIndexPattern } from '..';
 
 export type PhraseFilterMeta = FilterMeta & {
   params?: {
@@ -60,7 +61,7 @@ export const getPhraseFilterValue = (filter: PhraseFilter): PhraseFilterValue =>
 export const buildPhraseFilter = (
   field: IFieldType,
   value: any,
-  indexPattern: IIndexPattern
+  indexPattern: MinimalIndexPattern
 ): PhraseFilter => {
   const convertedValue = getConvertedValueForField(field, value);
 

src/plugins/data/common/es_query/filters/phrases_filter.ts

@@ -9,7 +9,8 @@
 import { Filter, FilterMeta } from './meta_filter';
 import { getPhraseScript } from './phrase_filter';
 import { FILTERS } from './index';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { MinimalIndexPattern } from '../es_query';
 
 export type PhrasesFilterMeta = FilterMeta & {
   params: string[]; // The unformatted values
@@ -34,7 +35,7 @@ export const getPhrasesFilterField = (filter: PhrasesFilter) => {
 export const buildPhrasesFilter = (
   field: IFieldType,
   params: any[],
-  indexPattern: IIndexPattern
+  indexPattern: MinimalIndexPattern
 ) => {
   const index = indexPattern.id;
   const type = FILTERS.PHRASES;

src/plugins/data/common/es_query/filters/range_filter.ts

@@ -8,7 +8,8 @@
 import type { estypes } from '@elastic/elasticsearch';
 import { map, reduce, mapValues, get, keys, pickBy } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
-import { IIndexPattern, IFieldType } from '../../index_patterns';
+import { IFieldType } from '../../index_patterns';
+import { MinimalIndexPattern } from '..';
 
 const OPERANDS_IN_RANGE = 2;
 
@@ -93,7 +94,7 @@ const format = (field: IFieldType, value: any) =>
 export const buildRangeFilter = (
   field: IFieldType,
   params: RangeFilterParams,
-  indexPattern: IIndexPattern,
+  indexPattern: MinimalIndexPattern,
   formattedValue?: string
 ): RangeFilter => {
   const filter: any = { meta: { index: indexPattern.id, params: {} } };

src/plugins/data/common/es_query/kuery/ast/ast.ts

@@ -10,10 +10,10 @@ import { JsonObject } from '@kbn/common-utils';
 import { nodeTypes } from '../node_types/index';
 import { KQLSyntaxError } from '../kuery_syntax_error';
 import { KueryNode, DslQuery, KueryParseOptions } from '../types';
-import { IIndexPattern } from '../../../index_patterns/types';
 
 // @ts-ignore
 import { parse as parseKuery } from './_generated_/kuery';
+import { MinimalIndexPattern } from '../..';
 
 const fromExpression = (
   expression: string | DslQuery,
@@ -65,7 +65,7 @@ export const fromKueryExpression = (
  */
 export const toElasticsearchQuery = (
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: MinimalIndexPattern,
   config?: Record<string, any>,
   context?: Record<string, any>
 ): JsonObject => {

src/plugins/data/common/es_query/kuery/functions/and.ts

@@ -7,7 +7,7 @@
  */
 
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode } from '../../..';
+import { MinimalIndexPattern, KueryNode } from '../../..';
 
 export function buildNodeParams(children: KueryNode[]) {
   return {
@@ -17,7 +17,7 @@ export function buildNodeParams(children: KueryNode[]) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: MinimalIndexPattern,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {

src/plugins/data/common/es_query/kuery/functions/exists.ts

@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import * as literal from '../node_types/literal';
-import { IIndexPattern, KueryNode, IFieldType } from '../../..';
+import { KueryNode, IFieldType, MinimalIndexPattern } from '../../..';
 
 export function buildNodeParams(fieldName: string) {
   return {
@@ -18,7 +18,7 @@ export function buildNodeParams(fieldName: string) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: MinimalIndexPattern,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {

src/plugins/data/common/es_query/kuery/functions/geo_bounding_box.ts

@@ -9,7 +9,7 @@
 import _ from 'lodash';
 import { nodeTypes } from '../node_types';
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode, IFieldType, LatLon } from '../../..';
+import { MinimalIndexPattern, KueryNode, IFieldType, LatLon } from '../../..';
 
 export function buildNodeParams(fieldName: string, params: any) {
   params = _.pick(params, 'topLeft', 'bottomRight');
@@ -26,7 +26,7 @@ export function buildNodeParams(fieldName: string, params: any) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: MinimalIndexPattern,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {

src/plugins/data/common/es_query/kuery/functions/geo_polygon.ts

@@ -8,7 +8,7 @@
 
 import { nodeTypes } from '../node_types';
 import * as ast from '../ast';
-import { IIndexPattern, KueryNode, IFieldType, LatLon } from '../../..';
+import { MinimalIndexPattern, KueryNode, IFieldType, LatLon } from '../../..';
 import { LiteralTypeBuildNode } from '../node_types/types';
 
 export function buildNodeParams(fieldName: string, points: LatLon[]) {
@@ -25,7 +25,7 @@ export function buildNodeParams(fieldName: string, points: LatLon[]) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: MinimalIndexPattern,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {

src/plugins/data/common/es_query/kuery/functions/is.ts

@@ -11,7 +11,7 @@ import { getPhraseScript } from '../../filters';
 import { getFields } from './utils/get_fields';
 import { getTimeZoneFromSettings } from '../../utils';
 import { getFullFieldNameNode } from './utils/get_full_field_name_node';
-import { IIndexPattern, KueryNode, IFieldType } from '../../..';
+import { MinimalIndexPattern, KueryNode, IFieldType } from '../../..';
 
 import * as ast from '../ast';
 
@@ -39,7 +39,7 @@ export function buildNodeParams(fieldName: string, value: any, isPhrase: boolean
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: MinimalIndexPattern,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {

src/plugins/data/common/es_query/kuery/functions/nested.ts

@@ -8,7 +8,7 @@
 
 import * as ast from '../ast';
 import * as literal from '../node_types/literal';
-import { IIndexPattern, KueryNode } from '../../..';
+import { MinimalIndexPattern, KueryNode } from '../../..';
 
 export function buildNodeParams(path: any, child: any) {
   const pathNode =
@@ -20,7 +20,7 @@ export function buildNodeParams(path: any, child: any) {
 
 export function toElasticsearchQuery(
   node: KueryNode,
-  indexPattern?: IIndexPattern,
+  indexPattern?: MinimalIndexPattern,
   config: Record<string, any> = {},
   context: Record<string, any> = {}
 ) {