fix circular dep

elastic · Apr 19, 2023 · eb9f239 · eb9f239
1 parent 3a826af
commit eb9f239
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/x-pack/plugins/aiops/public/components/change_point_detection/fields_config.tsx b/x-pack/plugins/aiops/public/components/change_point_detection/fields_config.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import { FieldStatsServices } from '@kbn/unified-field-list-plugin/public';
+import { type FieldStatsServices } from '@kbn/unified-field-list-plugin/public';
 import { useTimefilter, useTimeRangeUpdates } from '@kbn/ml-date-picker';
 import { useDataSource } from '../../hooks/use_data_source';
 import { useAiopsAppContext } from '../../hooks/use_aiops_app_context';

diff --git a/x-pack/plugins/aiops/public/components/change_point_detection/metric_field_selector.tsx b/x-pack/plugins/aiops/public/components/change_point_detection/metric_field_selector.tsx
@@ -8,7 +8,6 @@
 import React, { type FC, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBox, type EuiComboBoxOptionOption, EuiFormRow } from '@elastic/eui';
-import { type Field } from '@kbn/ml-plugin/common/types/fields';
 import { useChangePointDetectionContext } from './change_point_detection_context';
 import { useAiopsAppContext } from '../../hooks/use_aiops_app_context';
 
@@ -29,7 +28,7 @@ export const MetricFieldSelector: FC<MetricFieldSelectorProps> = React.memo(
         return {
           value: v.name,
           label: v.displayName,
-          field: { id: v.name, type: v.type } as Field,
+          field: { id: v.name, type: v.type },
         };
       });
     }, [metricFieldOptions]);

diff --git a/x-pack/plugins/aiops/public/components/change_point_detection/split_field_selector.tsx b/x-pack/plugins/aiops/public/components/change_point_detection/split_field_selector.tsx
@@ -8,7 +8,6 @@
 import React, { FC, useMemo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBox, type EuiComboBoxOptionOption, EuiFormRow } from '@elastic/eui';
-import { type Field } from '@kbn/ml-plugin/common/types/fields';
 import { useAiopsAppContext } from '../../hooks/use_aiops_app_context';
 import { useChangePointDetectionContext } from './change_point_detection_context';
 
@@ -34,7 +33,7 @@ export const SplitFieldSelector: FC<SplitFieldSelectorProps> = React.memo(({ val
       ...splitFieldsOptions.map((v) => ({
         value: v.name,
         label: v.displayName,
-        ...(v.name ? { field: { id: v.name, type: v?.type } as Field } : {}),
+        ...(v.name ? { field: { id: v.name, type: v?.type } } : {}),
       })),
     ];
   }, [splitFieldsOptions]);

diff --git a/x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts b/x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { createContext, useContext } from 'react';
+import { createContext, type FC, useContext } from 'react';
 
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
@@ -15,14 +15,17 @@ import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type { SharePluginStart } from '@kbn/share-plugin/public';
 import type {
-  CoreStart,
   CoreSetup,
+  CoreStart,
   HttpStart,
   IUiSettingsClient,
   ThemeServiceStart,
 } from '@kbn/core/public';
 import type { LensPublicStart } from '@kbn/lens-plugin/public';
-import { type GetMlSharedImportsReturnType } from '@kbn/ml-plugin/public';
+import { type EuiComboBoxProps } from '@elastic/eui/src/components/combo_box/combo_box';
+import { type DataView } from '@kbn/data-views-plugin/common';
+import type { FieldStatsProps, FieldStatsServices } from '@kbn/unified-field-list-plugin/public';
+import type { TimeRange as TimeRangeMs } from '@kbn/ml-date-picker';
 
 export interface AiopsAppDependencies {
   application: CoreStart['application'];
@@ -39,8 +42,13 @@ export interface AiopsAppDependencies {
   lens: LensPublicStart;
   // deps for unified field stats
   fieldStats?: {
-    useFieldStatsTrigger: GetMlSharedImportsReturnType['useFieldStatsTrigger'];
-    FieldStatsFlyoutProvider: GetMlSharedImportsReturnType['FieldStatsFlyoutProvider'];
+    useFieldStatsTrigger: () => { renderOption: EuiComboBoxProps<string>['renderOption'] };
+    FieldStatsFlyoutProvider: FC<{
+      dataView: DataView;
+      fieldStatsServices: FieldStatsServices;
+      timeRangeMs?: TimeRangeMs;
+      dslQuery?: FieldStatsProps['dslQuery'];
+    }>;
   };
 }
 

diff --git a/x-pack/plugins/aiops/tsconfig.json b/x-pack/plugins/aiops/tsconfig.json
@@ -51,7 +51,6 @@
     "@kbn/ml-route-utils",
     "@kbn/unified-field-list-plugin",
     "@kbn/ml-random-sampler-utils",
-    "@kbn/ml-plugin",
   ],
   "exclude": [
     "target/**/*",