From 87faf26e372cc8f54dc3ef308672337119d6b2a0 Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Wed, 17 Jun 2020 10:06:30 +0200
Subject: [PATCH] [ML] resolve PR review comments

---
 .../ml/public/application/contexts/kibana/kibana_context.ts | 3 +--
 .../plugins/ml/public/application/services/http_service.ts  | 6 +++++-
 .../ml/public/application/services/ml_api_service/index.ts  | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index 5c3d09baf9d1..2a156b5716ad 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -18,10 +18,9 @@ interface StartPlugins {
   data: DataPublicPluginStart;
   security?: SecurityPluginSetup;
   licenseManagement?: LicenseManagementUIPluginSetup;
-  kibanaVersion: string;
   share: SharePluginStart;
 }
-export type StartServices = CoreStart & StartPlugins;
+export type StartServices = CoreStart & StartPlugins & { kibanaVersion: string };
 // eslint-disable-next-line react-hooks/rules-of-hooks
 export const useMlKibana = () => useKibana<StartServices>();
 export type MlKibanaReactContextValue = KibanaReactContextValue<StartServices>;
diff --git a/x-pack/plugins/ml/public/application/services/http_service.ts b/x-pack/plugins/ml/public/application/services/http_service.ts
index 7144411c2885..bd927dc0e301 100644
--- a/x-pack/plugins/ml/public/application/services/http_service.ts
+++ b/x-pack/plugins/ml/public/application/services/http_service.ts
@@ -37,6 +37,8 @@ function getFetchOptions(
 /**
  * Function for making HTTP requests to Kibana's backend.
  * Wrapper for Kibana's HttpHandler.
+ *
+ * @deprecated use {@link HttpService} instead
  */
 export async function http<T>(options: HttpFetchOptionsWithPath): Promise<T> {
   const { path, fetchOptions } = getFetchOptions(options);
@@ -46,6 +48,8 @@ export async function http<T>(options: HttpFetchOptionsWithPath): Promise<T> {
 /**
  * Function for making HTTP requests to Kibana's backend which returns an Observable
  * with request cancellation support.
+ *
+ * @deprecated use {@link HttpService} instead
  */
 export function http$<T>(options: HttpFetchOptionsWithPath): Observable<T> {
   const { path, fetchOptions } = getFetchOptions(options);
@@ -55,7 +59,7 @@ export function http$<T>(options: HttpFetchOptionsWithPath): Observable<T> {
 /**
  * Creates an Observable from Kibana's HttpHandler.
  */
-export function fromHttpHandler<T>(input: string, init?: RequestInit): Observable<T> {
+function fromHttpHandler<T>(input: string, init?: RequestInit): Observable<T> {
   return new Observable<T>((subscriber) => {
     const controller = new AbortController();
     const signal = controller.signal;
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
index 3f2fd4436223..6d32fca6a645 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts
@@ -89,6 +89,10 @@ export function basePath() {
   return '/api/ml';
 }
 
+/**
+ * Temp solution to allow {@link ml} service to use http from
+ * the dependency_cache.
+ */
 const proxyHttpStart = new Proxy<HttpStart>(({} as unknown) as HttpStart, {
   get(obj, prop: keyof HttpStart) {
     try {