From d6812918ada33b4a83796864cfa5de338196713d Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Tue, 23 Jan 2018 08:49:32 -0700 Subject: [PATCH 1/4] have geo_bounds agg search inherit filter and query state from visualize search source --- .../tile_map/public/coordinate_maps_visualization.js | 5 +---- src/ui/public/visualize/visualize.js | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core_plugins/tile_map/public/coordinate_maps_visualization.js b/src/core_plugins/tile_map/public/coordinate_maps_visualization.js index ae22f730e39f3..cfb1c287320b3 100644 --- a/src/core_plugins/tile_map/public/coordinate_maps_visualization.js +++ b/src/core_plugins/tile_map/public/coordinate_maps_visualization.js @@ -1,14 +1,12 @@ import _ from 'lodash'; import { GeohashLayer } from './geohash_layer'; import { BaseMapsVisualizationProvider } from './base_maps_visualization'; -import { SearchSourceProvider } from 'ui/courier/data_source/search_source'; import { VisAggConfigProvider } from 'ui/vis/agg_config'; import './styles/_tilemap.less'; export function CoordinateMapsVisualizationProvider(Notifier, Private) { const AggConfig = Private(VisAggConfigProvider); - const SearchSource = Private(SearchSourceProvider); const BaseMapsVisualization = Private(BaseMapsVisualizationProvider); class CoordinateMapsVisualization extends BaseMapsVisualization { @@ -142,8 +140,7 @@ export function CoordinateMapsVisualizationProvider(Notifier, Private) { async getGeohashBounds() { const agg = this._getGeoHashAgg(); if (agg) { - const searchSource = new SearchSource(); - searchSource.index(this.vis.indexPattern); + const searchSource = this.vis.createInheritedSearchSource(); searchSource.size(0); searchSource.aggs(function () { const geoBoundsAgg = new AggConfig(agg.vis, { diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js index 136cc68947ef6..6917fa256d632 100644 --- a/src/ui/public/visualize/visualize.js +++ b/src/ui/public/visualize/visualize.js @@ -52,6 +52,10 @@ uiModules }); $scope.vis = $scope.savedObj.vis; + $scope.vis.createInheritedSearchSource = () => { + const searchSource = new $scope.vis.API.SearchSource().inherits($scope.savedObj.searchSource); + return searchSource; + }; // Set the passed in uiState to the vis object. uiState reference should never be changed if (!$scope.uiState) $scope.uiState = $scope.vis.getUiState(); From 78dbf0e65766c8d628c3e79e20f3dcbc12cbfc62 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Mon, 29 Jan 2018 19:51:19 -0700 Subject: [PATCH 2/4] throw error when there is not saved search to inherit from --- src/ui/public/visualize/visualize.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js index 6917fa256d632..ba0b5d6228c7f 100644 --- a/src/ui/public/visualize/visualize.js +++ b/src/ui/public/visualize/visualize.js @@ -53,6 +53,9 @@ uiModules $scope.vis = $scope.savedObj.vis; $scope.vis.createInheritedSearchSource = () => { + if (!$scope.savedObj.searchSource) { + throw new Error('Unable to inherite search source, visualize saved object does not have search source.'); + } const searchSource = new $scope.vis.API.SearchSource().inherits($scope.savedObj.searchSource); return searchSource; }; From 7c1bf3237eef8f44a4f7c9ee87ff3e922bd6ff0c Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Mon, 29 Jan 2018 19:52:28 -0700 Subject: [PATCH 3/4] spelling --- src/ui/public/visualize/visualize.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js index ba0b5d6228c7f..2837908689bbc 100644 --- a/src/ui/public/visualize/visualize.js +++ b/src/ui/public/visualize/visualize.js @@ -54,7 +54,7 @@ uiModules $scope.vis = $scope.savedObj.vis; $scope.vis.createInheritedSearchSource = () => { if (!$scope.savedObj.searchSource) { - throw new Error('Unable to inherite search source, visualize saved object does not have search source.'); + throw new Error('Unable to inherit search source, visualize saved object does not have search source.'); } const searchSource = new $scope.vis.API.SearchSource().inherits($scope.savedObj.searchSource); return searchSource; From 096a05a7ec0abea98d5859e8afe33c2218f645ce Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Mon, 16 Apr 2018 16:50:15 -0400 Subject: [PATCH 4/4] move factory-method to API object --- .../tile_map/public/coordinate_maps_visualization.js | 2 +- src/ui/public/vis/vis.js | 6 ++++++ src/ui/public/visualize/visualize.js | 8 +------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core_plugins/tile_map/public/coordinate_maps_visualization.js b/src/core_plugins/tile_map/public/coordinate_maps_visualization.js index cfb1c287320b3..1ce728de919f8 100644 --- a/src/core_plugins/tile_map/public/coordinate_maps_visualization.js +++ b/src/core_plugins/tile_map/public/coordinate_maps_visualization.js @@ -140,7 +140,7 @@ export function CoordinateMapsVisualizationProvider(Notifier, Private) { async getGeohashBounds() { const agg = this._getGeoHashAgg(); if (agg) { - const searchSource = this.vis.createInheritedSearchSource(); + const searchSource = this.vis.API.createInheritedSearchSource(this.vis.searchSource); searchSource.size(0); searchSource.aggs(function () { const geoBoundsAgg = new AggConfig(agg.vis, { diff --git a/src/ui/public/vis/vis.js b/src/ui/public/vis/vis.js index 697de1f3ce2b8..43fe40b60cee8 100644 --- a/src/ui/public/vis/vis.js +++ b/src/ui/public/vis/vis.js @@ -64,6 +64,12 @@ export function VisProvider(Private, Promise, indexPatterns, timefilter, getAppS const appState = getAppState(); brushEvent(appState)(event); } + }, + createInheritedSearchSource: (parentSearchSource) => { + if (!parentSearchSource) { + throw new Error('Unable to inherit search source, visualize saved object does not have search source.'); + } + return new SearchSource().inherits(parentSearchSource); } }; } diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js index 2837908689bbc..1800b019084cb 100644 --- a/src/ui/public/visualize/visualize.js +++ b/src/ui/public/visualize/visualize.js @@ -52,13 +52,7 @@ uiModules }); $scope.vis = $scope.savedObj.vis; - $scope.vis.createInheritedSearchSource = () => { - if (!$scope.savedObj.searchSource) { - throw new Error('Unable to inherit search source, visualize saved object does not have search source.'); - } - const searchSource = new $scope.vis.API.SearchSource().inherits($scope.savedObj.searchSource); - return searchSource; - }; + $scope.vis.searchSource = $scope.savedObj.searchSource; // Set the passed in uiState to the vis object. uiState reference should never be changed if (!$scope.uiState) $scope.uiState = $scope.vis.getUiState();