maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use tabify for regionmap (#14364)

Browse source
This commit is contained in:
Thomas Neirynck 2017-10-10 11:15:49 -04:00 committed by GitHub
parent bd53cc6370
commit 0175cac4f0
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core_plugins/region_map/public/region_map_controller.js
View file

@ -31,22 +31,16 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
}
});
$scope.$watch('esResponse', async function (response) {
$scope.$watch('esResponse', async function (tableGroup) {
kibanaMapReady.then(() => {
const metricsAgg = _.first($scope.vis.getAggConfig().bySchemaName.metric);
const termAggId = _.first(_.pluck($scope.vis.getAggConfig().bySchemaName.segment, 'id'));
let results;
if (!response || !response.aggregations) {
if (!tableGroup || !tableGroup.tables || !tableGroup.tables.length || tableGroup.tables[0].columns.length !== 2) {
results = [];
} else {
const buckets = response.aggregations[termAggId].buckets;
results = buckets.map((bucket) => {
return {
term: bucket.key,
value: metricsAgg.getValue(bucket)
};
});
const buckets = tableGroup.tables[0].rows;
results = buckets.map(([term, value]) => { return { term: term, value: value }; });
}
if (!$scope.vis.params.selectedJoinField && $scope.vis.params.selectedLayer) {
@ -58,6 +52,8 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private,
}
updateChoroplethLayer($scope.vis.params.selectedLayer.url, $scope.vis.params.selectedLayer.attribution);
const metricsAgg = _.first($scope.vis.getAggConfig().bySchemaName.metric);
choroplethLayer.setMetrics(results, metricsAgg);
setTooltipFormatter();

3
src/core_plugins/region_map/public/region_map_vis.js
View file

@ -78,7 +78,8 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps
}
])
},
responseHandler: 'none'
responseHandler: 'tabify'
});
});