undeprecates openFlyout/openModal & remove direct subservice access f…

…rom overlayService
elastic · Nov 18, 2019 · e26120b · e26120b
1 parent d64f550
commit e26120b
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 99 deletions.
diff --git a/docs/development/core/public/kibana-plugin-public.overlaystart.flyouts.md b/docs/development/core/public/kibana-plugin-public.overlaystart.flyouts.md
diff --git a/docs/development/core/public/kibana-plugin-public.overlaystart.md b/docs/development/core/public/kibana-plugin-public.overlaystart.md
@@ -16,8 +16,6 @@ export interface OverlayStart
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [banners](./kibana-plugin-public.overlaystart.banners.md) | <code>OverlayBannersStart</code> | [OverlayBannersStart](./kibana-plugin-public.overlaybannersstart.md) |
-|  [flyouts](./kibana-plugin-public.overlaystart.flyouts.md) | <code>OverlayFlyoutStart</code> |  |
-|  [modals](./kibana-plugin-public.overlaystart.modals.md) | <code>OverlayModalStart</code> |  |
 |  [openFlyout](./kibana-plugin-public.overlaystart.openflyout.md) | <code>OverlayFlyoutStart['open']</code> |  |
 |  [openModal](./kibana-plugin-public.overlaystart.openmodal.md) | <code>OverlayModalStart['open']</code> |  |
 
diff --git a/docs/development/core/public/kibana-plugin-public.overlaystart.modals.md b/docs/development/core/public/kibana-plugin-public.overlaystart.modals.md
diff --git a/docs/development/core/public/kibana-plugin-public.overlaystart.openflyout.md b/docs/development/core/public/kibana-plugin-public.overlaystart.openflyout.md
@@ -4,10 +4,6 @@
 
 ## OverlayStart.openFlyout property
 
-> Warning: This API is now obsolete.
-> 
-> Use [OverlayStart.flyouts](./kibana-plugin-public.overlaystart.flyouts.md) instead
-> 
 
 <b>Signature:</b>
 

diff --git a/docs/development/core/public/kibana-plugin-public.overlaystart.openmodal.md b/docs/development/core/public/kibana-plugin-public.overlaystart.openmodal.md
@@ -4,10 +4,6 @@
 
 ## OverlayStart.openModal property
 
-> Warning: This API is now obsolete.
-> 
-> Use [OverlayStart.modals](./kibana-plugin-public.overlaystart.modals.md) instead
-> 
 
 <b>Signature:</b>
 

diff --git a/src/core/public/overlays/overlay_service.mock.ts b/src/core/public/overlays/overlay_service.mock.ts
@@ -23,16 +23,10 @@ import { overlayModalServiceMock } from './modal/modal_service.mock';
 
 const createStartContractMock = () => {
   const startContract: DeeplyMockedKeys<OverlayStart> = {
-    openFlyout: jest.fn(),
-    openModal: jest.fn(),
+    openFlyout: overlayFlyoutServiceMock.createStartContract().open,
+    openModal: overlayModalServiceMock.createStartContract().open,
     banners: overlayBannersServiceMock.createStartContract(),
-    flyouts: overlayFlyoutServiceMock.createStartContract(),
-    modals: overlayModalServiceMock.createStartContract(),
   };
-  startContract.openModal.mockReturnValue({
-    close: jest.fn(),
-    onClose: Promise.resolve(),
-  });
   return startContract;
 };
 

diff --git a/src/core/public/overlays/overlay_service.ts b/src/core/public/overlays/overlay_service.ts
@@ -48,9 +48,6 @@ export class OverlayService {
 
     return {
       banners,
-      flyouts,
-      modals,
-
       openFlyout: flyouts.open.bind(flyouts),
       openModal: modals.open.bind(modals),
     };
@@ -61,17 +58,8 @@ export class OverlayService {
 export interface OverlayStart {
   /** {@link OverlayBannersStart} */
   banners: OverlayBannersStart;
-  /** {@link OverlayModalStart} */
-  modals: OverlayModalStart;
-  /** {@link OverlayFlyoutStart} */
-  flyouts: OverlayFlyoutStart;
-
-  /**
-   * @deprecated Use {@link OverlayStart.flyouts} instead
-   */
+  /** {@link OverlayFlyoutStart#open} */
   openFlyout: OverlayFlyoutStart['open'];
-  /**
-   * @deprecated Use {@link OverlayStart.modals} instead
-   */
+  /** {@link OverlayModalStart#open} */
   openModal: OverlayModalStart['open'];
 }
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
@@ -658,18 +658,12 @@ export interface OverlayStart {
     // (undocumented)
     banners: OverlayBannersStart;
     // Warning: (ae-forgotten-export) The symbol "OverlayFlyoutStart" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "OverlayFlyoutStart"
     // 
     // (undocumented)
-    flyouts: OverlayFlyoutStart;
+    openFlyout: OverlayFlyoutStart['open'];
     // Warning: (ae-forgotten-export) The symbol "OverlayModalStart" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "OverlayModalStart"
     // 
     // (undocumented)
-    modals: OverlayModalStart;
-    // @deprecated (undocumented)
-    openFlyout: OverlayFlyoutStart['open'];
-    // @deprecated (undocumented)
     openModal: OverlayModalStart['open'];
 }
 

diff --git a/...lugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap b/...lugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap