[ML] Using data views service for loading data views (#113961)

* [ML] Using data views service for loading data views * removing more saved object client uses * removing IIndexPattern use * removing IndexPattern use * removing more depricated types * fixing teste * fixing index pattern loading * tiny refactor * fixing rollup index test * changes based on review * adding size to find calls Co-authored-by: Kibana Machine <[email protected]>
elastic · Oct 13, 2021 · 95cd74d · 95cd74d
1 parent 21f4528
commit 95cd74d
Show file tree

Hide file tree

Showing 79 changed files with 721 additions and 529 deletions.
diff --git a/x-pack/plugins/ml/common/types/kibana.ts b/x-pack/plugins/ml/common/types/kibana.ts
@@ -8,7 +8,6 @@
 // custom edits or fixes for default kibana types which are incomplete
 
 import type { SimpleSavedObject } from 'kibana/public';
-import type { IndexPatternAttributes } from 'src/plugins/data/common';
 import type { FieldFormatsRegistry } from '../../../../../src/plugins/field_formats/common';
 
 export type IndexPatternTitle = string;
@@ -18,7 +17,6 @@ export interface Route {
   k7Breadcrumbs: () => any;
 }
 
-export type IndexPatternSavedObject = SimpleSavedObject<IndexPatternAttributes>;
 // TODO define saved object type
 export type SavedSearchSavedObject = SimpleSavedObject<any>;
 

diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
@@ -8,6 +8,7 @@
   ],
   "requiredPlugins": [
     "data",
+    "dataViews",
     "cloud",
     "features",
     "dataVisualizer",

diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
@@ -135,6 +135,7 @@ export const renderApp = (
     urlGenerators: deps.share.urlGenerators,
     maps: deps.maps,
     dataVisualizer: deps.dataVisualizer,
+    dataViews: deps.data.dataViews,
   });
 
   appMountParams.onAppLeave((actions) => actions.default());

diff --git a/x-pack/plugins/ml/public/application/components/data_grid/common.ts b/x-pack/plugins/ml/public/application/components/data_grid/common.ts
@@ -19,12 +19,9 @@ import { i18n } from '@kbn/i18n';
 
 import { CoreSetup } from 'src/core/public';
 
-import {
-  IndexPattern,
-  IFieldType,
-  ES_FIELD_TYPES,
-  KBN_FIELD_TYPES,
-} from '../../../../../../../src/plugins/data/public';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+
+import type { DataView, DataViewField } from '../../../../../../../src/plugins/data_views/common';
 
 import { DEFAULT_RESULTS_FIELD } from '../../../../common/constants/data_frame_analytics';
 import { extractErrorMessage } from '../../../../common/util/errors';
@@ -72,7 +69,7 @@ export const euiDataGridToolbarSettings = {
   showFullScreenSelector: false,
 };
 
-export const getFieldsFromKibanaIndexPattern = (indexPattern: IndexPattern): string[] => {
+export const getFieldsFromKibanaIndexPattern = (indexPattern: DataView): string[] => {
   const allFields = indexPattern.fields.map((f) => f.name);
   const indexPatternFields: string[] = allFields.filter((f) => {
     if (indexPattern.metaFields.includes(f)) {
@@ -98,7 +95,7 @@ export const getFieldsFromKibanaIndexPattern = (indexPattern: IndexPattern): str
  * @param RuntimeMappings
  */
 export function getCombinedRuntimeMappings(
-  indexPattern: IndexPattern | undefined,
+  indexPattern: DataView | undefined,
   runtimeMappings?: RuntimeMappings
 ): RuntimeMappings | undefined {
   let combinedRuntimeMappings = {};
@@ -219,7 +216,7 @@ export const getDataGridSchemaFromESFieldType = (
 };
 
 export const getDataGridSchemaFromKibanaFieldType = (
-  field: IFieldType | undefined
+  field: DataViewField | undefined
 ): string | undefined => {
   // Built-in values are ['boolean', 'currency', 'datetime', 'numeric', 'json']
   // To fall back to the default string schema it needs to be undefined.
@@ -312,7 +309,7 @@ export const getTopClasses = (row: Record<string, any>, mlResultsField: string):
 };
 
 export const useRenderCellValue = (
-  indexPattern: IndexPattern | undefined,
+  indexPattern: DataView | undefined,
   pagination: IndexPagination,
   tableItems: DataGridItem[],
   resultsField?: string,

diff --git a/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts b/x-pack/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
@@ -7,10 +7,10 @@
 
 import { FC } from 'react';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
-import type { IIndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 declare const DataRecognizer: FC<{
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
   savedSearch: SavedSearchSavedObject | null;
   results: {
     count: number;

diff --git a/.../public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/.../public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
@@ -8,15 +8,15 @@
 import React from 'react';
 import { shallowWithIntl } from '@kbn/test/jest';
 import { FullTimeRangeSelector } from './index';
-import { Query } from 'src/plugins/data/public';
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { Query } from 'src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 // Create a mock for the setFullTimeRange function in the service.
 // The mock is hoisted to the top, so need to prefix the mock function
 // with 'mock' so it can be used lazily.
-const mockSetFullTimeRange = jest.fn((indexPattern: IndexPattern, query: Query) => true);
+const mockSetFullTimeRange = jest.fn((indexPattern: DataView, query: Query) => true);
 jest.mock('./full_time_range_selector_service', () => ({
-  setFullTimeRange: (indexPattern: IndexPattern, query: Query) =>
+  setFullTimeRange: (indexPattern: DataView, query: Query) =>
     mockSetFullTimeRange(indexPattern, query),
 }));
 
@@ -26,7 +26,7 @@ describe('FullTimeRangeSelector', () => {
     fields: [],
     title: 'test-index-pattern',
     timeFieldName: '@timestamp',
-  } as unknown as IndexPattern;
+  } as unknown as DataView;
 
   const query: Query = {
     language: 'kuery',

diff --git a/...ns/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/...ns/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
@@ -8,12 +8,13 @@
 import React, { FC } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Query, IndexPattern } from 'src/plugins/data/public';
+import type { Query } from 'src/plugins/data/public';
 import { EuiButton } from '@elastic/eui';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { setFullTimeRange } from './full_time_range_selector_service';
 
 interface Props {
-  indexPattern: IndexPattern;
+  indexPattern: DataView;
   query: Query;
   disabled: boolean;
   callback?: (a: any) => void;
@@ -23,7 +24,7 @@ interface Props {
 // to the time range of data in the index(es) mapped to the supplied Kibana index pattern or query.
 export const FullTimeRangeSelector: FC<Props> = ({ indexPattern, query, disabled, callback }) => {
   // wrapper around setFullTimeRange to allow for the calling of the optional callBack prop
-  async function setRange(i: IndexPattern, q: Query) {
+  async function setRange(i: DataView, q: Query) {
     const fullTimeRange = await setFullTimeRange(i, q);
     if (typeof callback === 'function') {
       callback(fullTimeRange);

diff --git a/...ublic/application/components/full_time_range_selector/full_time_range_selector_service.ts b/...ublic/application/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -8,11 +8,11 @@
 import moment from 'moment';
 
 import { i18n } from '@kbn/i18n';
-import { Query } from 'src/plugins/data/public';
+import type { Query } from 'src/plugins/data/public';
 import dateMath from '@elastic/datemath';
 import { getTimefilter, getToastNotifications } from '../../util/dependency_cache';
 import { ml, GetTimeFieldRangeResponse } from '../../services/ml_api_service';
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { isPopulatedObject } from '../../../../common/util/object_utils';
 import { RuntimeMappings } from '../../../../common/types/fields';
 
@@ -22,7 +22,7 @@ export interface TimeRange {
 }
 
 export async function setFullTimeRange(
-  indexPattern: IndexPattern,
+  indexPattern: DataView,
   query: Query
 ): Promise<GetTimeFieldRangeResponse> {
   try {

diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix.tsx
@@ -24,7 +24,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import { DataView } from '../../../../../../../src/plugins/data_views/public';
 import { extractErrorMessage } from '../../../../common';
 import { isRuntimeMappings } from '../../../../common/util/runtime_field_utils';
 import { stringHash } from '../../../../common/util/string_utils';
@@ -89,7 +89,7 @@ export interface ScatterplotMatrixProps {
   legendType?: LegendType;
   searchQuery?: ResultsSearchQuery;
   runtimeMappings?: RuntimeMappings;
-  indexPattern?: IndexPattern;
+  indexPattern?: DataView;
 }
 
 export const ScatterplotMatrix: FC<ScatterplotMatrixProps> = ({

diff --git a/...gins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts b/...gins/ml/public/application/components/scatterplot_matrix/use_scatterplot_field_options.ts
@@ -7,12 +7,12 @@
 
 import { useMemo } from 'react';
 
-import type { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 import { ML__INCREMENTAL_ID } from '../../data_frame_analytics/common/fields';
 
 export const useScatterplotFieldOptions = (
-  indexPattern?: IndexPattern,
+  indexPattern?: DataView,
   includes?: string[],
   excludes?: string[],
   resultsField = ''

diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
 
 export const indexPatternMock = {
   id: 'the-index-pattern-id',
   title: 'the-index-pattern-title',
   fields: [],
-} as unknown as IndexPattern;
+} as unknown as DataView;
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IndexPatternsContract } from '../../../../../../../../src/plugins/data/public';
+import type { DataViewsContract } from '../../../../../../../../src/plugins/data_views/public';
 
 export const indexPatternsMock = new (class {
   fieldFormats = [];
@@ -19,4 +19,4 @@ export const indexPatternsMock = new (class {
   getIds = jest.fn();
   getTitles = jest.fn();
   make = jest.fn();
-})() as unknown as IndexPatternsContract;
+})() as unknown as DataViewsContract;
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
@@ -6,15 +6,15 @@
  */
 
 import React from 'react';
-import { IndexPattern, IndexPatternsContract } from '../../../../../../../src/plugins/data/public';
+import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
 import { MlServicesContext } from '../../app';
 
 export interface MlContextValue {
   combinedQuery: any;
-  currentIndexPattern: IndexPattern; // TODO this should be IndexPattern or null
+  currentIndexPattern: DataView; // TODO this should be IndexPattern or null
   currentSavedSearch: SavedSearchSavedObject | null;
-  indexPatterns: IndexPatternsContract;
+  indexPatterns: DataViewsContract;
   kibanaConfig: any; // IUiSettingsClient;
   kibanaVersion: string;
 }

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
@@ -9,7 +9,7 @@ import { useEffect, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../src/plugins/data_views/public';
 
 import { extractErrorMessage } from '../../../../common/util/errors';
 
@@ -34,7 +34,7 @@ export const useResultsViewConfig = (jobId: string) => {
   const mlContext = useMlContext();
   const trainedModelsApiService = useTrainedModelsApiService();
 
-  const [indexPattern, setIndexPattern] = useState<IndexPattern | undefined>(undefined);
+  const [indexPattern, setIndexPattern] = useState<DataView | undefined>(undefined);
   const [indexPatternErrorMessage, setIndexPatternErrorMessage] = useState<undefined | string>(
     undefined
   );
@@ -99,7 +99,7 @@ export const useResultsViewConfig = (jobId: string) => {
               ? jobConfigUpdate.dest.index[0]
               : jobConfigUpdate.dest.index;
             const destIndexPatternId = getIndexPatternIdFromName(destIndex) || destIndex;
-            let indexP: IndexPattern | undefined;
+            let indexP: DataView | undefined;
 
             try {
               indexP = await mlContext.indexPatterns.get(destIndexPatternId);

diff --git a/.../public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts b/.../public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
@@ -11,7 +11,7 @@ import { estypes } from '@elastic/elasticsearch';
 import { EuiDataGridColumn } from '@elastic/eui';
 import { CoreSetup } from 'src/core/public';
 
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../src/plugins/data_views/public';
 import { isRuntimeMappings } from '../../../../../../common/util/runtime_field_utils';
 import { RuntimeMappings } from '../../../../../../common/types/fields';
 import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../../common/constants/field_histograms';
@@ -52,13 +52,14 @@ function getRuntimeFieldColumns(runtimeMappings: RuntimeMappings) {
   });
 }
 
-function getIndexPatternColumns(indexPattern: IndexPattern, fieldsFilter: string[]) {
+function getIndexPatternColumns(indexPattern: DataView, fieldsFilter: string[]) {
   const { fields } = newJobCapsServiceAnalytics;
 
   return fields
     .filter((field) => fieldsFilter.includes(field.name))
     .map((field) => {
       const schema =
+        // @ts-expect-error field is not DataViewField
         getDataGridSchemaFromESFieldType(field.type) || getDataGridSchemaFromKibanaFieldType(field);
 
       return {
@@ -71,7 +72,7 @@ function getIndexPatternColumns(indexPattern: IndexPattern, fieldsFilter: string
 }
 
 export const useIndexData = (
-  indexPattern: IndexPattern,
+  indexPattern: DataView,
   query: Record<string, any> | undefined,
   toastNotifications: CoreSetup['notifications']['toasts'],
   runtimeMappings?: RuntimeMappings

diff --git a/.../pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx b/.../pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
@@ -12,7 +12,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { EuiDataGridColumn, EuiSpacer, EuiText } from '@elastic/eui';
 
-import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import {
   isClassificationAnalysis,
@@ -104,7 +104,7 @@ const getResultsSectionHeaderItems = (
 interface ExpandableSectionResultsProps {
   colorRange?: ReturnType<typeof useColorRange>;
   indexData: UseIndexDataReturnType;
-  indexPattern?: IndexPattern;
+  indexPattern?: DataView;
   jobConfig?: DataFrameAnalyticsConfig;
   needsDestIndexPattern: boolean;
   searchQuery: SavedSearchQuery;

diff --git a/...cs/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx b/...cs/pages/analytics_exploration/components/exploration_query_bar/exploration_query_bar.tsx
@@ -13,7 +13,7 @@ import { debounce } from 'lodash';
 import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
 import { estypes } from '@elastic/elasticsearch';
 import { Dictionary } from '../../../../../../../common/types/common';
-import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common';
+import { DataView } from '../../../../../../../../../../src/plugins/data_views/common';
 import { Query, QueryStringInput } from '../../../../../../../../../../src/plugins/data/public';
 
 import {
@@ -29,7 +29,7 @@ interface ErrorMessage {
 }
 
 export interface ExplorationQueryBarProps {
-  indexPattern: IIndexPattern;
+  indexPattern: DataView;
   setSearchQuery: (update: {
     queryString: string;
     query?: SavedSearchQuery;

diff --git a/.../analytics_exploration/components/exploration_results_table/exploration_results_table.tsx b/.../analytics_exploration/components/exploration_results_table/exploration_results_table.tsx
@@ -7,7 +7,7 @@
 
 import React, { FC } from 'react';
 
-import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import { getToastNotifications } from '../../../../../util/dependency_cache';
 import { useMlKibana } from '../../../../../contexts/kibana';
@@ -22,7 +22,7 @@ import { ExpandableSectionResults } from '../expandable_section';
 import { useExplorationResults } from './use_exploration_results';
 
 interface Props {
-  indexPattern: IndexPattern;
+  indexPattern: DataView;
   jobConfig: DataFrameAnalyticsConfig;
   jobStatus?: DataFrameTaskStateType;
   needsDestIndexPattern: boolean;

diff --git a/...ges/analytics_exploration/components/exploration_results_table/use_exploration_results.ts b/...ges/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
@@ -13,7 +13,7 @@ import { CoreSetup } from 'src/core/public';
 
 import { i18n } from '@kbn/i18n';
 import { MlApiServices } from '../../../../../services/ml_api_service';
-import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import type { DataView } from '../../../../../../../../../../src/plugins/data_views/public';
 
 import { DataLoader } from '../../../../../datavisualizer/index_based/data_loader';
 
@@ -41,7 +41,7 @@ import { FeatureImportanceBaseline } from '../../../../../../../common/types/fea
 import { useExplorationDataGrid } from './use_exploration_data_grid';
 
 export const useExplorationResults = (
-  indexPattern: IndexPattern | undefined,
+  indexPattern: DataView | undefined,
   jobConfig: DataFrameAnalyticsConfig | undefined,
   searchQuery: SavedSearchQuery,
   toastNotifications: CoreSetup['notifications']['toasts'],