Fix types

elastic · Mar 2, 2021 · e9a4409 · e9a4409
1 parent 2ede9f0
commit e9a4409
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/src/plugins/vis_type_timeseries/public/application/components/timeseries_visualization.tsx b/src/plugins/vis_type_timeseries/public/application/components/timeseries_visualization.tsx
@@ -15,7 +15,7 @@ import { PersistedState } from 'src/plugins/visualizations/public';
 // @ts-expect-error
 import { ErrorComponent } from './error';
 import { TimeseriesVisTypes } from './vis_types';
-import { TimeseriesVisParams } from '../../metrics_fn';
+import { TimeseriesVisParams } from '../../types';
 import { TimeseriesVisData } from '../../../common/types';
 
 interface TimeseriesVisualizationProps {

diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/index.ts b/src/plugins/vis_type_timeseries/public/application/components/vis_types/index.ts
@@ -11,7 +11,7 @@ import React, { lazy } from 'react';
 import { IUiSettingsClient } from 'src/core/public';
 import { PersistedState } from 'src/plugins/visualizations/public';
 
-import { TimeseriesVisParams } from '../../../metrics_fn';
+import { TimeseriesVisParams } from '../../../types';
 import { TimeseriesVisData } from '../../../../common/types';
 
 /**

diff --git a/src/plugins/vis_type_timeseries/public/request_handler.ts b/src/plugins/vis_type_timeseries/public/request_handler.ts
@@ -11,7 +11,7 @@ import { KibanaContext } from '../../data/public';
 import { getTimezone, validateInterval } from './application';
 import { getUISettings, getDataStart, getCoreStart } from './services';
 import { MAX_BUCKETS_SETTING, ROUTES } from '../common/constants';
-import { TimeseriesVisParams } from './metrics_fn';
+import { TimeseriesVisParams } from './types';
 import { TimeseriesVisData } from '../common/types';
 
 interface MetricsRequestHandlerParams {

diff --git a/src/plugins/vis_type_timeseries/public/timeseries_vis_renderer.tsx b/src/plugins/vis_type_timeseries/public/timeseries_vis_renderer.tsx
@@ -13,8 +13,9 @@ import { IUiSettingsClient } from 'kibana/public';
 import type { PersistedState } from '../../visualizations/public';
 import { VisualizationContainer } from '../../visualizations/public';
 import { ExpressionRenderDefinition } from '../../expressions/common/expression_renderers';
-import { TimeseriesRenderValue, TimeseriesVisParams } from './metrics_fn';
+import { TimeseriesRenderValue } from './metrics_fn';
 import { TimeseriesVisData } from '../common/types';
+import { TimeseriesVisParams } from './types';
 
 const TimeseriesVisualization = lazy(
   () => import('./application/components/timeseries_visualization')

diff --git a/src/plugins/visualize/public/application/types.ts b/src/plugins/visualize/public/application/types.ts
@@ -15,6 +15,7 @@ import {
   VisualizeEmbeddableContract,
   VisSavedObject,
   PersistedState,
+  VisParams,
 } from 'src/plugins/visualizations/public';
 import {
   CoreStart,
@@ -114,9 +115,9 @@ export interface ByValueVisInstance {
 
 export type VisualizeEditorVisInstance = SavedVisInstance | ByValueVisInstance;
 
-export type VisEditorConstructor = new (
+export type VisEditorConstructor<TVisParams = VisParams> = new (
   element: HTMLElement,
-  vis: Vis,
+  vis: Vis<TVisParams>,
   eventEmitter: EventEmitter,
   embeddableHandler: VisualizeEmbeddableContract
 ) => IEditorController;

diff --git a/src/plugins/visualize/public/vis_editors_registry.ts b/src/plugins/visualize/public/vis_editors_registry.ts
@@ -11,13 +11,13 @@ import { VisEditorConstructor } from './application/types';
 const DEFAULT_NAME = 'default';
 
 export const createVisEditorsRegistry = () => {
-  const map = new Map<string, VisEditorConstructor>();
+  const map = new Map<string, VisEditorConstructor<any>>();
 
   return {
     registerDefault: (editor: VisEditorConstructor) => {
       map.set(DEFAULT_NAME, editor);
     },
-    register: (name: string, editor: VisEditorConstructor) => {
+    register: <TVisParams>(name: string, editor: VisEditorConstructor<TVisParams>) => {
       if (name) {
         map.set(name, editor);
       }