Fixing typescript errors

elastic · Oct 1, 2020 · 9c965b5 · 9c965b5
1 parent 4911fad
commit 9c965b5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/src/plugins/visualizations/public/mocks.ts b/src/plugins/visualizations/public/mocks.ts
@@ -72,6 +72,7 @@ const createInstance = async () => {
       embeddable: embeddablePluginMock.createStartContract(),
       dashboard: dashboardPluginMock.createStartContract(),
       getAttributeService: jest.fn(),
+      savedObjectsClient: coreMock.createStart().savedObjects.client,
     });
 
   return {

diff --git a/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.test.tsx
@@ -28,6 +28,7 @@ import { IBasePath } from '../../../../../../src/core/public';
 import { AttributeService } from '../../../../../../src/plugins/dashboard/public';
 import { Ast } from '@kbn/interpreter/common';
 import { LensAttributeService } from '../../lens_attribute_service';
+import { OnSaveProps } from '../../../../../../src/plugins/saved_objects/public/save_modal';
 
 jest.mock('../../../../../../src/plugins/inspector/public/', () => ({
   isAvailable: false,
@@ -45,21 +46,38 @@ const savedVis: Document = {
   title: 'My title',
   visualizationType: '',
 };
+const defaultSaveMethod = (
+  type: string,
+  testAttributes: LensSavedObjectAttributes,
+  savedObjectId?: string
+): Promise<{ id: string }> => {
+  return new Promise(() => {
+    return { id: '123' };
+  });
+};
+const defaultUnwrapMethod = (savedObjectId: string): Promise<LensSavedObjectAttributes> => {
+  return new Promise(() => {
+    return { ...savedVis };
+  });
+};
+const defaultCheckForDuplicateTitle = (props: OnSaveProps): Promise<true> => {
+  return new Promise(() => {
+    return true;
+  });
+};
+const options = {
+  saveMethod: defaultSaveMethod,
+  unwrapMethod: defaultUnwrapMethod,
+  checkForDuplicateTitle: defaultCheckForDuplicateTitle,
+};
 
 const attributeServiceMockFromSavedVis = (document: Document): LensAttributeService => {
   const core = coreMock.createStart();
   const service = new AttributeService<
     LensSavedObjectAttributes,
     LensByValueInput,
     LensByReferenceInput
-  >(
-    'lens',
-    jest.fn(),
-    core.savedObjects.client,
-    core.overlays,
-    core.i18n.Context,
-    core.notifications.toasts
-  );
+  >('lens', jest.fn(), core.i18n.Context, core.notifications.toasts, options);
   service.unwrapAttributes = jest.fn((input: LensByValueInput | LensByReferenceInput) => {
     return Promise.resolve({ ...document } as LensSavedObjectAttributes);
   });

diff --git a/x-pack/plugins/lens/public/lens_attribute_service.ts b/x-pack/plugins/lens/public/lens_attribute_service.ts
@@ -13,7 +13,6 @@ import {
   LensByReferenceInput,
 } from './editor_frame_service/embeddable/embeddable';
 import { SavedObjectIndexStore, DOC_TYPE } from './persistence';
-import { SavedObjectAttributes } from '../../../../src/core/target/types/saved_objects';
 import { checkForDuplicateTitle, OnSaveProps } from '../../../../src/plugins/saved_objects/public';
 
 export type LensAttributeService = AttributeService<
@@ -44,8 +43,8 @@ export function getLensAttributeService(
       });
       return { id: savedDoc.savedObjectId };
     },
-    unwrapMethod: async (savedObjectId: string) => {
-      const savedObject = await core.savedObjects.client.get<SavedObjectAttributes>(
+    unwrapMethod: async (savedObjectId: string): Promise<LensSavedObjectAttributes> => {
+      const savedObject = await core.savedObjects.client.get<LensSavedObjectAttributes>(
         DOC_TYPE,
         savedObjectId
       );