feat: update deprecated methods

src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/field.tsx

@@ -6,14 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { IFieldType, indexPatterns as dataViewsUtils } from '@kbn/data-plugin/public';
+import { indexPatterns as dataViewsUtils } from '@kbn/data-plugin/public';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { flatten } from 'lodash';
-import { escapeKuery } from './lib/escape_kuery';
+import { escapeKuery } from '@kbn/es-query';
 import { sortPrefixFirst } from './sort_prefix_first';
 import { QuerySuggestionField, QuerySuggestionTypes } from '../query_suggestion_provider';
 import { KqlQuerySuggestionProvider } from './types';
 
-const keywordComparator = (first: IFieldType, second: IFieldType) => {
+const keywordComparator = (first: DataViewField, second: DataViewField) => {
   const extensions = ['raw', 'keyword'];
   if (extensions.map((ext) => `${first.name}.${ext}`).includes(second.name)) {
     return 1;

src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/lib/escape_kuery.ts

@@ -6,15 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { escapeKuery } from '@kbn/es-query';
-
 /**
  * Escapes backslashes and double-quotes. (Useful when putting a string in quotes to use as a value
  * in a KQL expression. See the QuotedCharacter rule in kuery.peg.)
  */
 export function escapeQuotes(str: string) {
   return str.replace(/[\\"]/g, '\\$&');
 }
-
-// Re-export this function from the @kbn/es-query package to avoid refactoring
-export { escapeKuery };

src/plugins/unified_search/public/autocomplete/providers/kql_query_suggestion/value.ts

@@ -8,7 +8,7 @@
 
 import { flatten } from 'lodash';
 import { CoreSetup } from '@kbn/core/public';
-import { IFieldType, IIndexPattern } from '@kbn/data-plugin/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { escapeQuotes } from './lib/escape_kuery';
 import { KqlQuerySuggestionProvider } from './types';
 import type { UnifiedSearchPublicPluginStart } from '../../../types';
@@ -36,7 +36,7 @@ export const setupGetValueSuggestions: KqlQuerySuggestionProvider = (
   ): Promise<QuerySuggestion[]> => {
     const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
 
-    const dataViewFieldEntries: Array<[IIndexPattern, IFieldType]> = [];
+    const dataViewFieldEntries: Array<[DataView, DataViewField]> = [];
     dataViews.forEach((dataView) => {
       dataView.fields
         .filter((field) => field.name === fullFieldName)

src/plugins/unified_search/public/autocomplete/providers/query_suggestion_provider.ts

@@ -7,7 +7,7 @@
  */
 
 import { ValueSuggestionsMethod } from '@kbn/data-plugin/common';
-import { IFieldType, IIndexPattern } from '@kbn/data-plugin/common';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 
 export enum QuerySuggestionTypes {
   Field = 'field',
@@ -24,7 +24,7 @@ export type QuerySuggestionGetFn = (
 /** @public **/
 export interface QuerySuggestionGetFnArgs {
   language: string;
-  indexPatterns: IIndexPattern[];
+  indexPatterns: DataView[];
   query: string;
   selectionStart: number;
   selectionEnd: number;
@@ -47,7 +47,7 @@ export interface QuerySuggestionBasic {
 /** @public **/
 export interface QuerySuggestionField extends QuerySuggestionBasic {
   type: QuerySuggestionTypes.Field;
-  field: IFieldType;
+  field: DataViewField;
 }
 
 /** @public **/

src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.test.ts

@@ -182,11 +182,10 @@ describe('FieldSuggestions', () => {
         useTimeRange: false,
       });
 
-      const customDataView = {
-        ...stubDataView,
+      const customDataView = Object.assign({}, stubDataView, {
         title: 'customDataView',
         useTimeRange: false,
-      };
+      });
 
       await getValueSuggestions({
         indexPattern: customDataView,

src/plugins/unified_search/public/autocomplete/providers/value_suggestion_provider.ts

@@ -10,28 +10,24 @@ import { CoreSetup } from '@kbn/core/public';
 import dateMath from '@kbn/datemath';
 import { buildQueryFromFilters } from '@kbn/es-query';
 import { memoize } from 'lodash';
-import {
-  IIndexPattern,
-  IFieldType,
-  UI_SETTINGS,
-  ValueSuggestionsMethod,
-} from '@kbn/data-plugin/common';
+import { UI_SETTINGS, ValueSuggestionsMethod } from '@kbn/data-plugin/common';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import type { TimefilterSetup } from '@kbn/data-plugin/public';
 import { AutocompleteUsageCollector } from '../collectors';
 
 export type ValueSuggestionsGetFn = (args: ValueSuggestionsGetFnArgs) => Promise<any[]>;
 
 interface ValueSuggestionsGetFnArgs {
-  indexPattern: IIndexPattern;
-  field: IFieldType;
+  indexPattern: DataView;
+  field: DataViewField;
   query: string;
   useTimeRange?: boolean;
   boolFilter?: any[];
   signal?: AbortSignal;
   method?: ValueSuggestionsMethod;
 }
 
-const getAutocompleteTimefilter = ({ timefilter }: TimefilterSetup, dataView: IIndexPattern) => {
+const getAutocompleteTimefilter = ({ timefilter }: TimefilterSetup, dataView: DataView) => {
   const timeRange = timefilter.getTime();
 
   // Use a rounded timerange so that memoizing works properly
@@ -51,7 +47,7 @@ export const setupValueSuggestionProvider = (
     usageCollector,
   }: { timefilter: TimefilterSetup; usageCollector?: AutocompleteUsageCollector }
 ): ValueSuggestionsGetFn => {
-  function resolver(title: string, field: IFieldType, query: string, filters: any[]) {
+  function resolver(title: string, field: DataViewField, query: string, filters: any[]) {
     // Only cache results for a minute
     const ttl = Math.floor(Date.now() / 1000 / 60);
     return [ttl, query, title, field.name, JSON.stringify(filters)].join('|');
@@ -60,7 +56,7 @@ export const setupValueSuggestionProvider = (
   const requestSuggestions = memoize(
     <T = unknown>(
       index: string,
-      field: IFieldType,
+      field: DataViewField,
       query: string,
       filters: any = [],
       signal?: AbortSignal,

src/plugins/unified_search/public/filter_bar/filter_editor/index.tsx

@@ -32,7 +32,7 @@ import {
 import { get } from 'lodash';
 import React, { Component } from 'react';
 import { XJsonLang } from '@kbn/monaco';
-import { DataView, IFieldType } from '@kbn/data-views-plugin/common';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { getIndexPatternFromFilter as getDataViewFromFilter } from '@kbn/data-plugin/public';
 import { CodeEditor } from '@kbn/kibana-react-plugin/public';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
@@ -59,7 +59,7 @@ export interface Props {
 
 interface State {
   selectedDataView?: DataView;
-  selectedField?: IFieldType;
+  selectedField?: DataViewField;
   selectedOperator?: Operator;
   params: any;
   useCustomLabel: boolean;
@@ -438,7 +438,7 @@ class FilterEditorUI extends Component<Props, State> {
     this.setState({ selectedDataView, selectedField, selectedOperator, params });
   };
 
-  private onFieldChange = ([selectedField]: IFieldType[]) => {
+  private onFieldChange = ([selectedField]: DataViewField[]) => {
     const selectedOperator = undefined;
     const params = undefined;
     this.setState({ selectedField, selectedOperator, params });
@@ -520,7 +520,7 @@ function DataViewComboBox(props: GenericComboBoxProps<DataView>) {
   return GenericComboBox(props);
 }
 
-function FieldComboBox(props: GenericComboBoxProps<IFieldType>) {
+function FieldComboBox(props: GenericComboBoxProps<DataViewField>) {
   return GenericComboBox(props);
 }
 

src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_editor_utils.ts

@@ -10,8 +10,8 @@ import dateMath from '@kbn/datemath';
 import { Filter, FieldFilter } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import isSemverValid from 'semver/functions/valid';
-import { isFilterable, IFieldType, IpAddress } from '@kbn/data-plugin/common';
-import { DataView } from '@kbn/data-views-plugin/common';
+import { isFilterable, IpAddress } from '@kbn/data-plugin/common';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { FILTER_OPERATORS, Operator } from './filter_operators';
 
 export function getFieldFromFilter(filter: FieldFilter, dataView: DataView) {
@@ -28,15 +28,15 @@ export function getFilterableFields(dataView: DataView) {
   return dataView.fields.filter(isFilterable);
 }
 
-export function getOperatorOptions(field: IFieldType) {
+export function getOperatorOptions(field: DataViewField) {
   return FILTER_OPERATORS.filter((operator) => {
     if (operator.field) return operator.field(field);
     if (operator.fieldTypes) return operator.fieldTypes.includes(field.type);
     return true;
   });
 }
 
-export function validateParams(params: any, field: IFieldType) {
+export function validateParams(params: any, field: DataViewField) {
   switch (field.type) {
     case 'date':
       const moment = typeof params === 'string' ? dateMath.parse(params) : null;
@@ -59,7 +59,7 @@ export function validateParams(params: any, field: IFieldType) {
 
 export function isFilterValid(
   dataView?: DataView,
-  field?: IFieldType,
+  field?: DataViewField,
   operator?: Operator,
   params?: any
 ) {

src/plugins/unified_search/public/filter_bar/filter_editor/lib/filter_operators.ts

@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { FILTERS } from '@kbn/es-query';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
-import { IFieldType } from '@kbn/data-views-plugin/common';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 
 export interface Operator {
   message: string;
@@ -25,7 +25,7 @@ export interface Operator {
    * A filter predicate for a field,
    * takes precedence over {@link fieldTypes}
    */
-  field?: (field: IFieldType) => boolean;
+  field?: (field: DataViewField) => boolean;
 }
 
 export const isOperator = {
@@ -68,7 +68,7 @@ export const isBetweenOperator = {
   }),
   type: FILTERS.RANGE,
   negate: false,
-  field: (field: IFieldType) => {
+  field: (field: DataViewField) => {
     if (['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'].includes(field.type))
       return true;
 
@@ -84,7 +84,7 @@ export const isNotBetweenOperator = {
   }),
   type: FILTERS.RANGE,
   negate: true,
-  field: (field: IFieldType) => {
+  field: (field: DataViewField) => {
     if (['number', 'number_range', 'date', 'date_range', 'ip', 'ip_range'].includes(field.type))
       return true;
 

src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx

@@ -8,8 +8,8 @@
 
 import React from 'react';
 import { withKibana, KibanaReactContextValue } from '@kbn/kibana-react-plugin/public';
-import { IFieldType, UI_SETTINGS } from '@kbn/data-plugin/common';
-import { DataView } from '@kbn/data-views-plugin/common';
+import { UI_SETTINGS } from '@kbn/data-plugin/common';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { IDataPluginServices } from '@kbn/data-plugin/public';
 import { debounce } from 'lodash';
 
@@ -18,7 +18,7 @@ import { getAutocomplete } from '../../services';
 export interface PhraseSuggestorProps {
   kibana: KibanaReactContextValue<IDataPluginServices>;
   indexPattern: DataView;
-  field: IFieldType;
+  field: DataViewField;
   timeRangeForSuggestionsOverride?: boolean;
 }
 

src/plugins/unified_search/public/filter_bar/filter_editor/range_value_input.tsx

@@ -12,7 +12,7 @@ import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { get } from 'lodash';
 import React from 'react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { IFieldType } from '@kbn/data-plugin/common';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { ValueInputType } from './value_input_type';
 
 interface RangeParams {
@@ -23,7 +23,7 @@ interface RangeParams {
 type RangeParamsPartial = Partial<RangeParams>;
 
 interface Props {
-  field: IFieldType;
+  field: DataViewField;
   value?: RangeParams;
   onChange: (params: RangeParamsPartial) => void;
   intl: InjectedIntl;

src/plugins/unified_search/public/filter_bar/filter_editor/value_input_type.tsx

@@ -10,12 +10,12 @@ import { EuiFieldNumber, EuiFieldText, EuiSelect } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n-react';
 import { isEmpty } from 'lodash';
 import React, { Component } from 'react';
-import { IFieldType } from '@kbn/data-views-plugin/common';
+import type { DataViewField } from '@kbn/data-views-plugin/public';
 import { validateParams } from './lib/filter_editor_utils';
 
 interface Props {
   value?: string | number;
-  field: IFieldType;
+  field: DataViewField;
   onChange: (value: string | number | boolean) => void;
   onBlur?: (value: string | number | boolean) => void;
   placeholder: string;

src/plugins/unified_search/server/autocomplete/terms_agg.test.ts

@@ -10,6 +10,7 @@ import { coreMock } from '@kbn/core/server/mocks';
 import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { ConfigSchema } from '../../config';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
+import type { FieldSpec } from '@kbn/data-views-plugin/common';
 import { termsAggSuggestions } from './terms_agg';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { duration } from 'moment';
@@ -50,7 +51,7 @@ describe('terms agg suggestions', () => {
       'fieldName',
       'query',
       [],
-      { name: 'field_name', type: 'string' }
+      { name: 'field_name', type: 'string' } as FieldSpec
     );
 
     const [[args]] = esClientMock.search.mock.calls;

src/plugins/unified_search/server/autocomplete/terms_agg.ts

@@ -9,7 +9,8 @@
 import { get, map } from 'lodash';
 import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IFieldType, getFieldSubtypeNested } from '@kbn/data-plugin/common';
+import { getFieldSubtypeNested } from '@kbn/data-plugin/common';
+import type { FieldSpec } from '@kbn/data-views-plugin/common';
 import { ConfigSchema } from '../../config';
 import { findIndexPatternById as findDataViewById, getFieldByName } from '../data_views';
 
@@ -21,7 +22,7 @@ export async function termsAggSuggestions(
   fieldName: string,
   query: string,
   filters?: estypes.QueryDslQueryContainer[],
-  field?: IFieldType,
+  field?: FieldSpec,
   abortSignal?: AbortSignal
 ) {
   const autocompleteSearchOptions = {
@@ -54,11 +55,11 @@ export async function termsAggSuggestions(
 async function getBody(
   // eslint-disable-next-line @typescript-eslint/naming-convention
   { timeout, terminate_after }: Record<string, any>,
-  field: IFieldType | string,
+  field: FieldSpec | string,
   query: string,
   filters: estypes.QueryDslQueryContainer[] = []
 ) {
-  const isFieldObject = (f: any): f is IFieldType => Boolean(f && f.name);
+  const isFieldObject = (f: any): f is FieldSpec => Boolean(f && f.name);
 
   // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
   const getEscapedQuery = (q: string = '') =>

src/plugins/unified_search/server/autocomplete/terms_enum.ts

@@ -8,7 +8,7 @@
 
 import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { IFieldType } from '@kbn/data-plugin/common';
+import type { FieldSpec } from '@kbn/data-views-plugin/common';
 import { findIndexPatternById as findDataViewById, getFieldByName } from '../data_views';
 import { ConfigSchema } from '../../config';
 
@@ -20,7 +20,7 @@ export async function termsEnumSuggestions(
   fieldName: string,
   query: string,
   filters?: estypes.QueryDslQueryContainer[],
-  field?: IFieldType,
+  field?: FieldSpec,
   abortSignal?: AbortSignal
 ) {
   const { tiers } = config.autocomplete.valueSuggestions;