updating based on review

elastic · Oct 30, 2018 · 21d4ab6 · 21d4ab6
1 parent c8dff2d
commit 21d4ab6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/ui/public/vis/request_handlers/request_handlers.d.ts b/src/ui/public/vis/request_handlers/request_handlers.d.ts
@@ -19,6 +19,7 @@
 
 import { SearchSource } from '../../courier';
 import { QueryFilter } from '../../filter_bar/query_filter';
+import { Adapters } from '../../inspector/types';
 import { PersistedState } from '../../persisted_state';
 import { Filters, Query, TimeRange } from '../../visualize';
 import { AggConfigs } from '../agg_configs';
@@ -34,7 +35,7 @@ export interface RequestHandlerParams {
   queryFilter: QueryFilter;
   uiState: PersistedState;
   partialRows?: boolean;
-  inspectorAdapters?: any;
+  inspectorAdapters?: Adapters;
 }
 
 export type RequestHandler = <T>(vis: Vis, params: RequestHandlerParams) => T;

diff --git a/src/ui/public/visualize/loader/__tests__/visualize_loader.js b/src/ui/public/visualize/loader/__tests__/visualize_loader.js
@@ -95,7 +95,7 @@ describe('visualize loader', () => {
         }
       ]
     });
-    vis.type.requestHandler = 'none';
+    vis.type.requestHandler = 'courier';
     vis.type.responseHandler = 'none';
     vis.type.requiresSearch = false;
 

diff --git a/src/ui/public/visualize/loader/embedded_visualize_handler.ts b/src/ui/public/visualize/loader/embedded_visualize_handler.ts
@@ -19,6 +19,7 @@
 
 import { EventEmitter } from 'events';
 import { debounce } from 'lodash';
+import { Adapters } from '../../inspector/types';
 import { PersistedState } from '../../persisted_state';
 import { IPrivate } from '../../private';
 import { RenderCompleteHelper } from '../../render_complete';
@@ -68,7 +69,7 @@ export class EmbeddedVisualizeHandler {
   private readonly appState?: AppState;
   private uiState: PersistedState;
   private dataLoader: VisualizeDataLoader;
-  private inspectorAdapters = {};
+  private inspectorAdapters: Adapters = {};
 
   constructor(
     private readonly element: HTMLElement,
@@ -112,6 +113,7 @@ export class EmbeddedVisualizeHandler {
 
     this.dataLoader = new VisualizeDataLoader(vis, Private);
     this.renderCompleteHelper = new RenderCompleteHelper(element);
+    this.inspectorAdapters = this.getActiveInspectorAdapters();
     this.vis.openInspector = this.openInspector;
     this.vis.hasInspector = this.hasInspector;
 
@@ -246,8 +248,8 @@ export class EmbeddedVisualizeHandler {
    * since we need to read out data from the the vis type to check which
    * inspectors are available.
    */
-  private getActiveInspectorAdapters = () => {
-    const adapters = {} as any;
+  private getActiveInspectorAdapters = (): Adapters => {
+    const adapters: Adapters = {};
     const { inspectorAdapters: typeAdapters } = this.vis.type;
 
     // Add the requests inspector adapters if the vis type explicitly requested it via
@@ -307,7 +309,6 @@ export class EmbeddedVisualizeHandler {
   };
 
   private fetch = (forceFetch: boolean = false) => {
-    this.inspectorAdapters = this.getActiveInspectorAdapters();
     this.dataLoaderParams.aggs = this.vis.getAggConfig();
     this.dataLoaderParams.forceFetch = forceFetch;
     this.dataLoaderParams.inspectorAdapters = this.inspectorAdapters;