[Refactor] Move AttributeService from Dashboard to Embeddable plugin (#…

…79830) * [Refactor] Move AttributeService from Dashboard to Embeddable plugin * Fix wrong import * Fixing typescript errors * Make Dashboard a required dependency * Fixing circular dependency * Fix label namespace * Updating docs Co-authored-by: Kibana Machine <[email protected]>
elastic · Oct 12, 2020 · 13059bd · 13059bd
1 parent 356c017
commit 13059bd
Show file tree

Hide file tree

Showing 42 changed files with 335 additions and 71 deletions.
diff --git a/...eddable/public/kibana-plugin-plugins-embeddable-public.attribute_service_key.md b/...eddable/public/kibana-plugin-plugins-embeddable-public.attribute_service_key.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [ATTRIBUTE\_SERVICE\_KEY](./kibana-plugin-plugins-embeddable-public.attribute_service_key.md)
+
+## ATTRIBUTE\_SERVICE\_KEY variable
+
+The attribute service is a shared, generic service that embeddables can use to provide the functionality required to fulfill the requirements of the ReferenceOrValueEmbeddable interface. The attribute\_service can also be used as a higher level wrapper to transform an embeddable input shape that references a saved object into an embeddable input shape that contains that saved object's attributes by value.
+
+<b>Signature:</b>
+
+```typescript
+ATTRIBUTE_SERVICE_KEY = "attributes"
+```
diff --git a/...ublic/kibana-plugin-plugins-embeddable-public.attributeservice._constructor_.md b/...ublic/kibana-plugin-plugins-embeddable-public.attributeservice._constructor_.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) &gt; [(constructor)](./kibana-plugin-plugins-embeddable-public.attributeservice._constructor_.md)
+
+## AttributeService.(constructor)
+
+Constructs a new instance of the `AttributeService` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(type: string, showSaveModal: (saveModal: React.ReactElement, I18nContext: I18nStart['Context']) => void, i18nContext: I18nStart['Context'], toasts: NotificationsStart['toasts'], options: AttributeServiceOptions<SavedObjectAttributes>, getEmbeddableFactory?: (embeddableFactoryId: string) => EmbeddableFactory);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  type | <code>string</code> |  |
+|  showSaveModal | <code>(saveModal: React.ReactElement, I18nContext: I18nStart['Context']) =&gt; void</code> |  |
+|  i18nContext | <code>I18nStart['Context']</code> |  |
+|  toasts | <code>NotificationsStart['toasts']</code> |  |
+|  options | <code>AttributeServiceOptions&lt;SavedObjectAttributes&gt;</code> |  |
+|  getEmbeddableFactory | <code>(embeddableFactoryId: string) =&gt; EmbeddableFactory</code> |  |
+
diff --git a/...in-plugins-embeddable-public.attributeservice.getexplicitinputfromembeddable.md b/...in-plugins-embeddable-public.attributeservice.getexplicitinputfromembeddable.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) &gt; [getExplicitInputFromEmbeddable](./kibana-plugin-plugins-embeddable-public.attributeservice.getexplicitinputfromembeddable.md)
+
+## AttributeService.getExplicitInputFromEmbeddable() method
+
+<b>Signature:</b>
+
+```typescript
+getExplicitInputFromEmbeddable(embeddable: IEmbeddable): ValType | RefType;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  embeddable | <code>IEmbeddable</code> |  |
+
+<b>Returns:</b>
+
+`ValType | RefType`
+
diff --git a/...c/kibana-plugin-plugins-embeddable-public.attributeservice.getinputasreftype.md b/...c/kibana-plugin-plugins-embeddable-public.attributeservice.getinputasreftype.md
@@ -0,0 +1,16 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) &gt; [getInputAsRefType](./kibana-plugin-plugins-embeddable-public.attributeservice.getinputasreftype.md)
+
+## AttributeService.getInputAsRefType property
+
+<b>Signature:</b>
+
+```typescript
+getInputAsRefType: (input: ValType | RefType, saveOptions?: {
+        showSaveModal: boolean;
+        saveModalTitle?: string | undefined;
+    } | {
+        title: string;
+    } | undefined) => Promise<RefType>;
+```
diff --git a/...kibana-plugin-plugins-embeddable-public.attributeservice.getinputasvaluetype.md b/...kibana-plugin-plugins-embeddable-public.attributeservice.getinputasvaluetype.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) &gt; [getInputAsValueType](./kibana-plugin-plugins-embeddable-public.attributeservice.getinputasvaluetype.md)
+
+## AttributeService.getInputAsValueType property
+
+<b>Signature:</b>
+
+```typescript
+getInputAsValueType: (input: ValType | RefType) => Promise<ValType>;
+```
diff --git a/...blic/kibana-plugin-plugins-embeddable-public.attributeservice.inputisreftype.md b/...blic/kibana-plugin-plugins-embeddable-public.attributeservice.inputisreftype.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) &gt; [inputIsRefType](./kibana-plugin-plugins-embeddable-public.attributeservice.inputisreftype.md)
+
+## AttributeService.inputIsRefType property
+
+<b>Signature:</b>
+
+```typescript
+inputIsRefType: (input: ValType | RefType) => input is RefType;
+```
diff --git a/...s/embeddable/public/kibana-plugin-plugins-embeddable-public.attributeservice.md b/...s/embeddable/public/kibana-plugin-plugins-embeddable-public.attributeservice.md
@@ -0,0 +1,40 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md)
+
+## AttributeService class
+
+<b>Signature:</b>
+
+```typescript
+export declare class AttributeService<SavedObjectAttributes extends {
+    title: string;
+}, ValType extends EmbeddableInput & {
+    [ATTRIBUTE_SERVICE_KEY]: SavedObjectAttributes;
+} = EmbeddableInput & {
+    [ATTRIBUTE_SERVICE_KEY]: SavedObjectAttributes;
+}, RefType extends SavedObjectEmbeddableInput = SavedObjectEmbeddableInput> 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(type, showSaveModal, i18nContext, toasts, options, getEmbeddableFactory)](./kibana-plugin-plugins-embeddable-public.attributeservice._constructor_.md) |  | Constructs a new instance of the <code>AttributeService</code> class |
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [getInputAsRefType](./kibana-plugin-plugins-embeddable-public.attributeservice.getinputasreftype.md) |  | <code>(input: ValType &#124; RefType, saveOptions?: {</code><br/><code>        showSaveModal: boolean;</code><br/><code>        saveModalTitle?: string &#124; undefined;</code><br/><code>    } &#124; {</code><br/><code>        title: string;</code><br/><code>    } &#124; undefined) =&gt; Promise&lt;RefType&gt;</code> |  |
+|  [getInputAsValueType](./kibana-plugin-plugins-embeddable-public.attributeservice.getinputasvaluetype.md) |  | <code>(input: ValType &#124; RefType) =&gt; Promise&lt;ValType&gt;</code> |  |
+|  [inputIsRefType](./kibana-plugin-plugins-embeddable-public.attributeservice.inputisreftype.md) |  | <code>(input: ValType &#124; RefType) =&gt; input is RefType</code> |  |
+
+## Methods
+
+|  Method | Modifiers | Description |
+|  --- | --- | --- |
+|  [getExplicitInputFromEmbeddable(embeddable)](./kibana-plugin-plugins-embeddable-public.attributeservice.getexplicitinputfromembeddable.md) |  |  |
+|  [unwrapAttributes(input)](./kibana-plugin-plugins-embeddable-public.attributeservice.unwrapattributes.md) |  |  |
+|  [wrapAttributes(newAttributes, useRefType, input)](./kibana-plugin-plugins-embeddable-public.attributeservice.wrapattributes.md) |  |  |
+
diff --git a/...ic/kibana-plugin-plugins-embeddable-public.attributeservice.unwrapattributes.md b/...ic/kibana-plugin-plugins-embeddable-public.attributeservice.unwrapattributes.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) &gt; [unwrapAttributes](./kibana-plugin-plugins-embeddable-public.attributeservice.unwrapattributes.md)
+
+## AttributeService.unwrapAttributes() method
+
+<b>Signature:</b>
+
+```typescript
+unwrapAttributes(input: RefType | ValType): Promise<SavedObjectAttributes>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  input | <code>RefType &#124; ValType</code> |  |
+
+<b>Returns:</b>
+
+`Promise<SavedObjectAttributes>`
+
diff --git a/...blic/kibana-plugin-plugins-embeddable-public.attributeservice.wrapattributes.md b/...blic/kibana-plugin-plugins-embeddable-public.attributeservice.wrapattributes.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) &gt; [wrapAttributes](./kibana-plugin-plugins-embeddable-public.attributeservice.wrapattributes.md)
+
+## AttributeService.wrapAttributes() method
+
+<b>Signature:</b>
+
+```typescript
+wrapAttributes(newAttributes: SavedObjectAttributes, useRefType: boolean, input?: ValType | RefType): Promise<Omit<ValType | RefType, 'id'>>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  newAttributes | <code>SavedObjectAttributes</code> |  |
+|  useRefType | <code>boolean</code> |  |
+|  input | <code>ValType &#124; RefType</code> |  |
+
+<b>Returns:</b>
+
+`Promise<Omit<ValType | RefType, 'id'>>`
+
diff --git a/.../kibana-plugin-plugins-embeddable-public.embeddablestart.getattributeservice.md b/.../kibana-plugin-plugins-embeddable-public.embeddablestart.getattributeservice.md
@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) &gt; [EmbeddableStart](./kibana-plugin-plugins-embeddable-public.embeddablestart.md) &gt; [getAttributeService](./kibana-plugin-plugins-embeddable-public.embeddablestart.getattributeservice.md)
+
+## EmbeddableStart.getAttributeService property
+
+<b>Signature:</b>
+
+```typescript
+getAttributeService: <A extends {
+        title: string;
+    }, V extends EmbeddableInput & {
+        [ATTRIBUTE_SERVICE_KEY]: A;
+    } = EmbeddableInput & {
+        [ATTRIBUTE_SERVICE_KEY]: A;
+    }, R extends SavedObjectEmbeddableInput = SavedObjectEmbeddableInput>(type: string, options: AttributeServiceOptions<A>) => AttributeService<A, V, R>;
+```
diff --git a/...ns/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestart.md b/...ns/embeddable/public/kibana-plugin-plugins-embeddable-public.embeddablestart.md
@@ -15,6 +15,7 @@ export interface EmbeddableStart extends PersistableState<EmbeddableInput>
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [EmbeddablePanel](./kibana-plugin-plugins-embeddable-public.embeddablestart.embeddablepanel.md) | <code>EmbeddablePanelHOC</code> |  |
+|  [getAttributeService](./kibana-plugin-plugins-embeddable-public.embeddablestart.getattributeservice.md) | <code>&lt;A extends {</code><br/><code>        title: string;</code><br/><code>    }, V extends EmbeddableInput &amp; {</code><br/><code>        [ATTRIBUTE_SERVICE_KEY]: A;</code><br/><code>    } = EmbeddableInput &amp; {</code><br/><code>        [ATTRIBUTE_SERVICE_KEY]: A;</code><br/><code>    }, R extends SavedObjectEmbeddableInput = SavedObjectEmbeddableInput&gt;(type: string, options: AttributeServiceOptions&lt;A&gt;) =&gt; AttributeService&lt;A, V, R&gt;</code> |  |
 |  [getEmbeddableFactories](./kibana-plugin-plugins-embeddable-public.embeddablestart.getembeddablefactories.md) | <code>() =&gt; IterableIterator&lt;EmbeddableFactory&gt;</code> |  |
 |  [getEmbeddableFactory](./kibana-plugin-plugins-embeddable-public.embeddablestart.getembeddablefactory.md) | <code>&lt;I extends EmbeddableInput = EmbeddableInput, O extends EmbeddableOutput = EmbeddableOutput, E extends IEmbeddable&lt;I, O&gt; = IEmbeddable&lt;I, O&gt;&gt;(embeddableFactoryId: string) =&gt; EmbeddableFactory&lt;I, O, E&gt; &#124; undefined</code> |  |
 |  [getEmbeddablePanel](./kibana-plugin-plugins-embeddable-public.embeddablestart.getembeddablepanel.md) | <code>(stateTransfer?: EmbeddableStateTransfer) =&gt; EmbeddablePanelHOC</code> |  |

diff --git a/...evelopment/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.md b/...evelopment/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.md
@@ -9,6 +9,7 @@
 |  Class | Description |
 |  --- | --- |
 |  [AddPanelAction](./kibana-plugin-plugins-embeddable-public.addpanelaction.md) |  |
+|  [AttributeService](./kibana-plugin-plugins-embeddable-public.attributeservice.md) |  |
 |  [Container](./kibana-plugin-plugins-embeddable-public.container.md) |  |
 |  [EditPanelAction](./kibana-plugin-plugins-embeddable-public.editpanelaction.md) |  |
 |  [Embeddable](./kibana-plugin-plugins-embeddable-public.embeddable.md) |  |
@@ -71,6 +72,7 @@
 |  --- | --- |
 |  [ACTION\_ADD\_PANEL](./kibana-plugin-plugins-embeddable-public.action_add_panel.md) |  |
 |  [ACTION\_EDIT\_PANEL](./kibana-plugin-plugins-embeddable-public.action_edit_panel.md) |  |
+|  [ATTRIBUTE\_SERVICE\_KEY](./kibana-plugin-plugins-embeddable-public.attribute_service_key.md) | The attribute service is a shared, generic service that embeddables can use to provide the functionality required to fulfill the requirements of the ReferenceOrValueEmbeddable interface. The attribute\_service can also be used as a higher level wrapper to transform an embeddable input shape that references a saved object into an embeddable input shape that contains that saved object's attributes by value. |
 |  [CONTEXT\_MENU\_TRIGGER](./kibana-plugin-plugins-embeddable-public.context_menu_trigger.md) |  |
 |  [contextMenuTrigger](./kibana-plugin-plugins-embeddable-public.contextmenutrigger.md) |  |
 |  [defaultEmbeddableFactoryProvider](./kibana-plugin-plugins-embeddable-public.defaultembeddablefactoryprovider.md) |  |

diff --git a/.../kibana-plugin-plugins-embeddable-server.embeddablesetup.getattributeservice.md b/.../kibana-plugin-plugins-embeddable-server.embeddablesetup.getattributeservice.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-server](./kibana-plugin-plugins-embeddable-server.md) &gt; [EmbeddableSetup](./kibana-plugin-plugins-embeddable-server.embeddablesetup.md) &gt; [getAttributeService](./kibana-plugin-plugins-embeddable-server.embeddablesetup.getattributeservice.md)
+
+## EmbeddableSetup.getAttributeService property
+
+<b>Signature:</b>
+
+```typescript
+getAttributeService: any;
+```
diff --git a/...ns/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.md b/...ns/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.md
@@ -14,6 +14,7 @@ export interface EmbeddableSetup
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [getAttributeService](./kibana-plugin-plugins-embeddable-server.embeddablesetup.getattributeservice.md) | <code>any</code> |  |
 |  [registerEmbeddableFactory](./kibana-plugin-plugins-embeddable-server.embeddablesetup.registerembeddablefactory.md) | <code>(factory: EmbeddableRegistryDefinition) =&gt; void</code> |  |
 |  [registerEnhancement](./kibana-plugin-plugins-embeddable-server.embeddablesetup.registerenhancement.md) | <code>(enhancement: EnhancementRegistryDefinition) =&gt; void</code> |  |
 
diff --git a/examples/embeddable_examples/kibana.json b/examples/embeddable_examples/kibana.json
@@ -4,7 +4,7 @@
   "kibanaVersion": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["embeddable", "uiActions", "dashboard", "savedObjects"],
+  "requiredPlugins": ["embeddable", "uiActions", "savedObjects", "dashboard"],
   "optionalPlugins": [],
   "extraPublicDirs": ["public/todo", "public/hello_world", "public/todo/todo_ref_embeddable"],
   "requiredBundles": ["kibanaReact"]

diff --git a/examples/embeddable_examples/public/book/book_embeddable.tsx b/examples/embeddable_examples/public/book/book_embeddable.tsx
@@ -26,10 +26,10 @@ import {
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
   ReferenceOrValueEmbeddable,
+  AttributeService,
 } from '../../../../src/plugins/embeddable/public';
 import { BookSavedObjectAttributes } from '../../common';
 import { BookEmbeddableComponent } from './book_component';
-import { AttributeService } from '../../../../src/plugins/dashboard/public';
 
 export const BOOK_EMBEDDABLE = 'book';
 export type BookEmbeddableInput = BookByValueInput | BookByReferenceInput;

diff --git a/examples/embeddable_examples/public/book/book_embeddable_factory.tsx b/examples/embeddable_examples/public/book/book_embeddable_factory.tsx
@@ -25,6 +25,8 @@ import {
   EmbeddableFactoryDefinition,
   IContainer,
   EmbeddableFactory,
+  EmbeddableStart,
+  AttributeService,
 } from '../../../../src/plugins/embeddable/public';
 import {
   BookEmbeddable,
@@ -38,11 +40,10 @@ import {
   SavedObjectsClientContract,
   SimpleSavedObject,
 } from '../../../../src/core/public';
-import { DashboardStart, AttributeService } from '../../../../src/plugins/dashboard/public';
 import { checkForDuplicateTitle, OnSaveProps } from '../../../../src/plugins/saved_objects/public';
 
 interface StartServices {
-  getAttributeService: DashboardStart['getAttributeService'];
+  getAttributeService: EmbeddableStart['getAttributeService'];
   openModal: OverlayStart['openModal'];
   savedObjectsClient: SavedObjectsClientContract;
   overlays: OverlayStart;

diff --git a/examples/embeddable_examples/public/book/edit_book_action.tsx b/examples/embeddable_examples/public/book/edit_book_action.tsx
@@ -22,21 +22,24 @@ import { i18n } from '@kbn/i18n';
 import { BookSavedObjectAttributes, BOOK_SAVED_OBJECT } from '../../common';
 import { createAction } from '../../../../src/plugins/ui_actions/public';
 import { toMountPoint } from '../../../../src/plugins/kibana_react/public';
-import { ViewMode, SavedObjectEmbeddableInput } from '../../../../src/plugins/embeddable/public';
+import {
+  ViewMode,
+  SavedObjectEmbeddableInput,
+  EmbeddableStart,
+} from '../../../../src/plugins/embeddable/public';
 import {
   BookEmbeddable,
   BOOK_EMBEDDABLE,
   BookByReferenceInput,
   BookByValueInput,
 } from './book_embeddable';
 import { CreateEditBookComponent } from './create_edit_book_component';
-import { DashboardStart } from '../../../../src/plugins/dashboard/public';
 import { OnSaveProps } from '../../../../src/plugins/saved_objects/public';
 import { SavedObjectsClientContract } from '../../../../src/core/target/types/public/saved_objects';
 
 interface StartServices {
   openModal: OverlayStart['openModal'];
-  getAttributeService: DashboardStart['getAttributeService'];
+  getAttributeService: EmbeddableStart['getAttributeService'];
   savedObjectsClient: SavedObjectsClientContract;
 }
 

diff --git a/examples/embeddable_examples/public/plugin.ts b/examples/embeddable_examples/public/plugin.ts
@@ -62,7 +62,6 @@ import {
   ACTION_ADD_BOOK_TO_LIBRARY,
   createAddBookToLibraryAction,
 } from './book/add_book_to_library_action';
-import { DashboardStart } from '../../../src/plugins/dashboard/public';
 import {
   ACTION_UNLINK_BOOK_FROM_LIBRARY,
   createUnlinkBookFromLibraryAction,
@@ -75,7 +74,6 @@ export interface EmbeddableExamplesSetupDependencies {
 
 export interface EmbeddableExamplesStartDependencies {
   embeddable: EmbeddableStart;
-  dashboard: DashboardStart;
   savedObjectsClient: SavedObjectsClient;
 }
 
@@ -157,15 +155,15 @@ export class EmbeddableExamplesPlugin
     this.exampleEmbeddableFactories.getBookEmbeddableFactory = deps.embeddable.registerEmbeddableFactory(
       BOOK_EMBEDDABLE,
       new BookEmbeddableFactoryDefinition(async () => ({
-        getAttributeService: (await core.getStartServices())[1].dashboard.getAttributeService,
+        getAttributeService: (await core.getStartServices())[1].embeddable.getAttributeService,
         openModal: (await core.getStartServices())[0].overlays.openModal,
         savedObjectsClient: (await core.getStartServices())[0].savedObjects.client,
         overlays: (await core.getStartServices())[0].overlays,
       }))
     );
 
     const editBookAction = createEditBookAction(async () => ({
-      getAttributeService: (await core.getStartServices())[1].dashboard.getAttributeService,
+      getAttributeService: (await core.getStartServices())[1].embeddable.getAttributeService,
       openModal: (await core.getStartServices())[0].overlays.openModal,
       savedObjectsClient: (await core.getStartServices())[0].savedObjects.client,
     }));

diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts
@@ -45,7 +45,6 @@ export {
 export { addEmbeddableToDashboardUrl } from './url_utils/url_helper';
 export { SavedObjectDashboard } from './saved_dashboards';
 export { SavedDashboardPanel } from './types';
-export { AttributeService, ATTRIBUTE_SERVICE_KEY } from './attribute_service';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DashboardPlugin(initializerContext);

diff --git a/src/plugins/dashboard/public/mocks.tsx b/src/plugins/dashboard/public/mocks.tsx
@@ -20,13 +20,10 @@
 import { DashboardStart } from './plugin';
 
 export type Start = jest.Mocked<DashboardStart>;
-export { mockAttributeService } from './attribute_service/attribute_service.mock';
 
 const createStartContract = (): DashboardStart => {
   // @ts-ignore
-  const startContract: DashboardStart = {
-    getAttributeService: jest.fn(),
-  };
+  const startContract: DashboardStart = {};
 
   return startContract;
 };