Clean up KibanaDatatable and KibanaContext types.

elastic · May 23, 2019 · 248d0ed · 248d0ed
1 parent 14e8043
commit 248d0ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/legacy/core_plugins/interpreter/common/types/kibana_context.ts b/src/legacy/core_plugins/interpreter/common/types/kibana_context.ts
@@ -17,14 +17,15 @@
  * under the License.
  */
 
+import { Filters, Query, TimeRange } from 'ui/visualize';
+
 const name = 'kibana_context';
 
-// TODO: Provide better typings for these
 export interface KibanaContext {
   type: typeof name;
-  query: any[];
-  filters: any[];
-  timeRange: any;
+  query?: Query;
+  filters?: Filters;
+  timeRange?: TimeRange;
 }
 
 export const kibanaContext = () => ({

diff --git a/src/legacy/core_plugins/interpreter/common/types/kibana_datatable.ts b/src/legacy/core_plugins/interpreter/common/types/kibana_datatable.ts
@@ -27,7 +27,7 @@ interface Column {
 }
 
 interface Row {
-  [key: string]: object;
+  [key: string]: unknown;
 }
 
 export interface KibanaDatatable {

diff --git a/src/legacy/core_plugins/interpreter/types/index.ts b/src/legacy/core_plugins/interpreter/types/index.ts
@@ -20,3 +20,4 @@
 export { ArgumentType, TypeToArgumentString } from './arguments';
 export { UnwrapPromise } from './common';
 export { ExpressionFunction } from './functions';
+export * from '../common/types';
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/run_pipeline.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/run_pipeline.ts
@@ -21,17 +21,12 @@
 import { fromExpression } from '@kbn/interpreter/common';
 // @ts-ignore
 import { getInterpreter } from 'plugins/interpreter/interpreter';
+// @ts-ignore
+import { KibanaContext } from 'plugins/interpreter/types';
 
 import { Adapters } from 'ui/inspector';
-import { Filters, Query, TimeRange } from 'ui/visualize';
-
-interface InitialContextObject {
-  timeRange?: TimeRange;
-  filters?: Filters;
-  query?: Query;
-}
 
-type getInitialContextFunction = () => InitialContextObject;
+type getInitialContextFunction = () => KibanaContext;
 
 interface RunPipelineHandlers {
   getInitialContext: getInitialContextFunction;