[APM] Replace StaticIndexPattern with IIndexPattern (#51689)

elastic · Nov 26, 2019 · e721ec4 · e721ec4
1 parent f7d9e7b
commit e721ec4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/__test__/UpdateBreadcrumbs.test.js b/x-pack/legacy/plugins/apm/public/components/app/Main/__test__/UpdateBreadcrumbs.test.js
@@ -10,7 +10,6 @@ import { MemoryRouter } from 'react-router-dom';
 import { UpdateBreadcrumbs } from '../UpdateBreadcrumbs';
 import * as kibanaCore from '../../../../../../observability/public/context/kibana_core';
 
-jest.mock('ui/index_patterns');
 jest.mock('ui/new_platform');
 
 const coreMock = {

diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx
@@ -7,7 +7,6 @@
 import React, { useState } from 'react';
 import { uniqueId, startsWith } from 'lodash';
 import styled from 'styled-components';
-import { StaticIndexPattern } from 'ui/index_patterns';
 import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import { fromQuery, toQuery } from '../Links/url_helpers';
@@ -19,7 +18,8 @@ import { useUrlParams } from '../../../hooks/useUrlParams';
 import { history } from '../../../utils/history';
 import {
   AutocompleteSuggestion,
-  AutocompleteProvider
+  AutocompleteProvider,
+  IIndexPattern
 } from '../../../../../../../../src/plugins/data/public';
 import { useDynamicIndexPattern } from '../../../hooks/useDynamicIndexPattern';
 import { usePlugins } from '../../../new-platform/plugin';
@@ -33,18 +33,15 @@ interface State {
   isLoadingSuggestions: boolean;
 }
 
-function convertKueryToEsQuery(
-  kuery: string,
-  indexPattern: StaticIndexPattern
-) {
+function convertKueryToEsQuery(kuery: string, indexPattern: IIndexPattern) {
   const ast = fromKueryExpression(kuery);
   return toElasticsearchQuery(ast, indexPattern);
 }
 
 function getSuggestions(
   query: string,
   selectionStart: number,
-  indexPattern: StaticIndexPattern,
+  indexPattern: IIndexPattern,
   boolFilter: unknown,
   autocompleteProvider?: AutocompleteProvider
 ) {

diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
@@ -6,7 +6,6 @@
 
 import moment from 'moment';
 import { KibanaRequest } from 'src/core/server';
-import { StaticIndexPattern } from 'ui/index_patterns';
 import { IIndexPattern } from 'src/plugins/data/common';
 import { APMConfig } from '../../../../../../plugins/apm/server';
 import {
@@ -22,7 +21,7 @@ import { ProcessorEvent } from '../../../common/processor_event';
 import { getDynamicIndexPattern } from '../index_pattern/get_dynamic_index_pattern';
 
 function decodeUiFilters(
-  indexPattern: StaticIndexPattern | undefined,
+  indexPattern: IIndexPattern | undefined,
   uiFiltersEncoded?: string
 ) {
   if (!uiFiltersEncoded || !indexPattern) {

diff --git a/x-pack/legacy/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts b/x-pack/legacy/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { StaticIndexPattern } from 'ui/index_patterns';
 import { APICaller } from 'src/core/server';
 import LRU from 'lru-cache';
 import {
@@ -51,7 +50,7 @@ export const getDynamicIndexPattern = async ({
       pattern: patternIndices
     });
 
-    const indexPattern: StaticIndexPattern = {
+    const indexPattern: IIndexPattern = {
       fields,
       title: indexPatternTitle
     };