Use Search API in TSVB

src/plugins/vis_type_timeseries/server/index.ts

@@ -21,7 +21,7 @@ import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/serve
 import { VisTypeTimeseriesConfig, config as configSchema } from './config';
 import { VisTypeTimeseriesPlugin } from './plugin';
 
-export { VisTypeTimeseriesSetup, Framework } from './plugin';
+export { VisTypeTimeseriesSetup } from './plugin';
 
 export const config: PluginConfigDescriptor<VisTypeTimeseriesConfig> = {
   deprecations: ({ unused, renameFromRoot }) => [
@@ -39,10 +39,10 @@ export const config: PluginConfigDescriptor<VisTypeTimeseriesConfig> = {
 
 export { ValidationTelemetryServiceSetup } from './validation_telemetry';
 
-// @ts-ignore
-export { AbstractSearchStrategy } from './lib/search_strategies/strategies/abstract_search_strategy';
-// @ts-ignore
-export { AbstractSearchRequest } from './lib/search_strategies/search_requests/abstract_request';
+export {
+  AbstractSearchStrategy,
+  ReqFacade,
+} from './lib/search_strategies/strategies/abstract_search_strategy';
 // @ts-ignore
 export { DefaultSearchCapabilities } from './lib/search_strategies/default_search_capabilities';
 

src/plugins/vis_type_timeseries/server/lib/get_fields.ts

@@ -38,6 +38,7 @@ export async function getFields(
   // level object passed from here. The layers should be refactored fully at some point, but for now
   // this works and we are still using the New Platform services for these vis data portions.
   const reqFacade: ReqFacade = {
+    requestContext,
     ...request,
     framework,
     payload: {},
@@ -48,22 +49,6 @@ export async function getFields(
     },
     getUiSettingsService: () => requestContext.core.uiSettings.client,
     getSavedObjectsClient: () => requestContext.core.savedObjects.client,
-    server: {
-      plugins: {
-        elasticsearch: {
-          getCluster: () => {
-            return {
-              callWithRequest: async (req: any, endpoint: string, params: any) => {
-                return await requestContext.core.elasticsearch.legacy.client.callAsCurrentUser(
-                  endpoint,
-                  params
-                );
-              },
-            };
-          },
-        },
-      },
-    },
     getEsShardTimeout: async () => {
       return await framework.globalConfig$
         .pipe(

src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts

@@ -21,7 +21,7 @@ import { FakeRequest, RequestHandlerContext } from 'kibana/server';
 import _ from 'lodash';
 import { first, map } from 'rxjs/operators';
 import { getPanelData } from './vis_data/get_panel_data';
-import { Framework } from '../index';
+import { Framework } from '../plugin';
 import { ReqFacade } from './search_strategies/strategies/abstract_search_strategy';
 
 interface GetVisDataResponse {
@@ -65,28 +65,13 @@ export function getVisData(
   // level object passed from here. The layers should be refactored fully at some point, but for now
   // this works and we are still using the New Platform services for these vis data portions.
   const reqFacade: ReqFacade = {
+    requestContext,
     ...request,
     framework,
     pre: {},
     payload: request.body,
     getUiSettingsService: () => requestContext.core.uiSettings.client,
     getSavedObjectsClient: () => requestContext.core.savedObjects.client,
-    server: {
-      plugins: {
-        elasticsearch: {
-          getCluster: () => {
-            return {
-              callWithRequest: async (req: any, endpoint: string, params: any) => {
-                return await requestContext.core.elasticsearch.legacy.client.callAsCurrentUser(
-                  endpoint,
-                  params
-                );
-              },
-            };
-          },
-        },
-      },
-    },
     getEsShardTimeout: async () => {
       return await framework.globalConfig$
         .pipe(