updating to latest master

elastic · Nov 6, 2018 · dc1e225 · dc1e225
1 parent c834c2c
commit dc1e225
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 32 deletions.
diff --git a/src/core_plugins/kibana_canvas_visualize/public/functions/esaggs.js b/src/core_plugins/kibana_canvas_visualize/public/functions/esaggs.js
@@ -22,7 +22,6 @@ import { CourierRequestHandlerProvider } from 'ui/vis/request_handlers/courier';
 import { AggConfigs } from 'ui/vis/agg_configs';
 
 // need to get rid of angular from these
-import { VisProvider } from 'ui/vis/vis';
 import { IndexPatternsProvider } from 'ui/index_patterns';
 import { SearchSourceProvider } from 'ui/courier/search_source';
 
@@ -46,6 +45,14 @@ export default () => ({
       types: ['string', 'null'],
       default: null,
     },
+    hierarchical: {
+      types: ['bool', 'null'],
+      default: false,
+    },
+    partialRows: {
+      types: ['bool', 'null'],
+      default: false,
+    },
     aggConfigs: {
       types: ['string'],
       default: '""',
@@ -58,7 +65,6 @@ export default () => ({
       const Private = $injector.get('Private');
       const indexPatterns = Private(IndexPatternsProvider);
       const SearchSource = Private(SearchSourceProvider);
-      const Vis = Private(VisProvider);
 
       const aggConfigsState = JSON.parse(args.aggConfigs);
       const indexPattern = await indexPatterns.get(args.index);
@@ -68,17 +74,15 @@ export default () => ({
       const searchSource = new SearchSource();
       searchSource.setField('index', indexPattern);
 
-      // we need vis just for the inspector
-      const vis = new Vis(indexPattern);
-      vis.aggs = aggs;
-
-      const response = await courierRequestHandler(vis, {
+      const response = await courierRequestHandler({
         searchSource: searchSource,
         aggs: aggs,
         timeRange: _.get(context, 'timeRange', null),
         query: _.get(context, 'q', null),
         filters: _.get(context, 'filters', null),
-        forceFetch: true
+        forceFetch: true,
+        isHierarchical: args.hierarchical,
+        showPartial: args.partialRows,
       });
 
       return {

diff --git a/src/core_plugins/kibana_canvas_visualize/public/functions/timelion_vis.js b/src/core_plugins/kibana_canvas_visualize/public/functions/timelion_vis.js
@@ -21,8 +21,6 @@ import _ from 'lodash';
 
 import { TimelionRequestHandlerProvider } from '../../../timelion/public/vis/timelion_request_handler';
 
-// need to get rid of angular from these
-import { VisProvider } from 'ui/vis/vis';
 
 import chrome from 'ui/chrome';
 
@@ -49,16 +47,13 @@ export default () => ({
     return chrome.dangerouslyGetActiveInjector().then(async $injector => {
       const Private = $injector.get('Private');
       const timelionRequestHandler = Private(TimelionRequestHandlerProvider).handler;
-      const Vis = Private(VisProvider);
 
-      // we need vis just for the inspector
-      const vis = new Vis(null, { type: 'timelion', params: { expression: args.expression } });
-
-      const response = await timelionRequestHandler(vis, {
+      const response = await timelionRequestHandler({
         timeRange: _.get(context, 'timeRange', null),
         query: _.get(context, 'q', null),
         filters: _.get(context, 'filters', null),
-        forceFetch: true
+        forceFetch: true,
+        params: { expression: args.expression }
       });
 
       return {

diff --git a/src/core_plugins/kibana_canvas_visualize/public/functions/tsvb.js b/src/core_plugins/kibana_canvas_visualize/public/functions/tsvb.js
@@ -21,9 +21,6 @@ import _ from 'lodash';
 
 import { MetricsRequestHandlerProvider } from '../../../metrics/public/kbn_vis_types/request_handler';
 
-// need to get rid of angular from these
-import { VisProvider } from 'ui/vis/vis';
-
 import chrome from 'ui/chrome';
 
 
@@ -53,18 +50,15 @@ export default () => ({
     return chrome.dangerouslyGetActiveInjector().then(async $injector => {
       const Private = $injector.get('Private');
       const metricsRequestHandler = Private(MetricsRequestHandlerProvider).handler;
-      const Vis = Private(VisProvider);
 
       const params = JSON.parse(args.params);
 
-      // we need vis just for the inspector
-      const vis = new Vis(null, { type: 'metrics', params: params });
-
-      const response = await metricsRequestHandler(vis, {
+      const response = await metricsRequestHandler({
         timeRange: _.get(context, 'timeRange', null),
         query: _.get(context, 'q', null),
         filters: _.get(context, 'filters', null),
-        uiState: vis.getUiState(),
+        params: params,
+        uiState: {}, //vis.getUiState(),
       });
 
       return {

diff --git a/src/core_plugins/kibana_canvas_visualize/public/functions/vega.js b/src/core_plugins/kibana_canvas_visualize/public/functions/vega.js
@@ -20,7 +20,6 @@
 import chrome from 'ui/chrome';
 
 import { VegaRequestHandlerProvider } from '../../../vega/public/vega_request_handler';
-import { VisProvider } from 'ui/vis/vis';
 import _ from 'lodash';
 
 export default () => ({
@@ -43,16 +42,13 @@ export default () => ({
 
     return chrome.dangerouslyGetActiveInjector().then(async $injector => {
       const Private = $injector.get('Private');
-      const Vis = Private(VisProvider);
       const vegaRequestHandler = Private(VegaRequestHandlerProvider).handler;
 
-      // we need to remove vis dependency from vega request handler
-      const vis = new Vis(null, { type: 'vega', params: { spec: args.spec } });
-
-      const response = await vegaRequestHandler(vis, {
-        timeRange: _.get(context, 'timeRange', null),
+      const response = await vegaRequestHandler({
+        timeRange: timeRange || _.get(context, 'timeRange', null),
         query: _.get(context, 'q', null),
         filters: _.get(context, 'filters', null),
+        params: { spec: args.spec },
         forceFetch: true
       });