change some types

flash1293 · Apr 29, 2019 · 1e24e4b · 1e24e4b
1 parent 1ce9f30
commit 1e24e4b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/legacy/core_plugins/embeddable_api/public/containers/container.ts b/src/legacy/core_plugins/embeddable_api/public/containers/container.ts
@@ -30,6 +30,7 @@ import {
 } from '../embeddables';
 import { ViewMode } from '../types';
 import { IContainer } from './i_container';
+import { IEmbeddable } from '../embeddables/i_embeddable';
 
 export interface PanelState<E extends { [key: string]: unknown } = { [key: string]: unknown }> {
   savedObjectId?: string;
@@ -63,7 +64,7 @@ export abstract class Container<
 > extends Embeddable<I, O> implements IContainer<I, O> {
   public readonly isContainer: boolean = true;
   protected readonly children: {
-    [key: string]: Embeddable<any, any> | ErrorEmbeddable;
+    [key: string]: IEmbeddable<any, any> | ErrorEmbeddable;
   } = {};
   public readonly embeddableFactories: EmbeddableFactoryRegistry;
 
@@ -111,11 +112,11 @@ export abstract class Container<
   public async addNewEmbeddable<
     EEI extends EmbeddableInput = EmbeddableInput,
     EEO extends EmbeddableOutput = EmbeddableOutput,
-    E extends Embeddable<EEI, EEO> = Embeddable<EEI, EEO>
+    E extends IEmbeddable<EEI, EEO> = IEmbeddable<EEI, EEO>
   >(type: string, explicitInput: Partial<EEI>): Promise<E | ErrorEmbeddable> {
     const factory = this.embeddableFactories.getFactoryByName(type) as EmbeddableFactory<
       EEI,
-      any,
+      EEO,
       E
     >;
     const panelState = this.createNewPanelState<EEI>(factory, explicitInput);
@@ -135,11 +136,11 @@ export abstract class Container<
 
   public async addSavedObjectEmbeddable<
     EEI extends EmbeddableInput = EmbeddableInput,
-    E extends Embeddable<EEI> = Embeddable<EEI>
+    E extends IEmbeddable<EEI, EmbeddableOutput> = IEmbeddable<EEI, EmbeddableOutput>
   >(type: string, savedObjectId: string): Promise<E | ErrorEmbeddable> {
     const factory = this.embeddableFactories.getFactoryByName(type) as EmbeddableFactory<
       EEI,
-      any,
+      EmbeddableOutput,
       E
     >;
     const panelState = this.createNewPanelState<EEI>(factory);
@@ -308,7 +309,7 @@ export abstract class Container<
 
   private createNewExplicitEmbeddableInput<
     EEI extends EmbeddableInput = EmbeddableInput,
-    E extends Embeddable<EEI> = Embeddable<EEI>
+    E extends IEmbeddable<EEI, EmbeddableOutput> = IEmbeddable<EEI, EmbeddableOutput>
   >(id: string, factory: EmbeddableFactory<EEI, any, E>, partial: Partial<EEI> = {}) {
     const inheritedInput = this.getInheritedInput(id) as { [key: string]: unknown };
     const defaults = factory.getDefaultInputParameters() as { [key: string]: unknown };
@@ -342,7 +343,7 @@ export abstract class Container<
 
   private async onPanelAdded(panel: PanelState) {
     const factory = this.embeddableFactories.getFactoryByName(panel.type);
-    const embeddable = await factory.create<Embeddable>(
+    const embeddable: IEmbeddable<EmbeddableInput, EmbeddableOutput> = await factory.create(
       this.getInputForChild(panel.embeddableId),
       this
     );

diff --git a/src/legacy/core_plugins/embeddable_api/public/containers/i_container.ts b/src/legacy/core_plugins/embeddable_api/public/containers/i_container.ts
@@ -103,7 +103,7 @@ export interface IContainer<
   addNewEmbeddable<
     EEI extends EmbeddableInput = EmbeddableInput,
     EEO extends EmbeddableOutput = EmbeddableOutput,
-    E extends Embeddable<EEI, EEO> = Embeddable<EEI, EEO>
+    E extends IEmbeddable<EEI, EEO> = IEmbeddable<EEI, EEO>
   >(
     type: string,
     explicitInput: Partial<EEI>

diff --git a/src/legacy/core_plugins/embeddable_api/public/embeddables/embeddable_factory.ts b/src/legacy/core_plugins/embeddable_api/public/embeddables/embeddable_factory.ts
@@ -23,6 +23,7 @@ import { Embeddable, EmbeddableInput, EmbeddableOutput } from './embeddable';
 import { ErrorEmbeddable } from './error_embeddable';
 import { Container, ContainerOutput } from '../containers';
 import { ContainerInput } from '../containers/i_container';
+import { IEmbeddable } from './i_embeddable';
 
 export interface EmbeddableInstanceConfiguration {
   id: string;
@@ -49,7 +50,7 @@ export interface OutputSpec {
 export abstract class EmbeddableFactory<
   I extends EmbeddableInput = EmbeddableInput,
   O extends EmbeddableOutput = EmbeddableOutput,
-  E extends Embeddable<I, O> = Embeddable<I, O>,
+  E extends IEmbeddable<I, O> = IEmbeddable<I, O>,
   T extends SavedObjectAttributes = SavedObjectAttributes
 > {
   public readonly name: string;