github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

dont use schemas in aggconfigs to output dsl (#26010) (#26065)

Browse source
This commit is contained in:
Peter Pisljar 2018-11-22 05:22:16 +01:00 • committed by GitHub
parent 0bdafcf0e2
commit 465adb9166
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core_plugins/kibana/public/visualize/editor/editor.js
View file

@ -423,6 +423,7 @@ function VisEditor(
const searchSourceGrandparent = searchSourceParent.getParent();
delete savedVis.savedSearchId;
delete vis.savedSearchId;
searchSourceParent.setField('filter', _.union(searchSource.getOwnField('filter'), searchSourceParent.getOwnField('filter')));
$state.query = searchSourceParent.getField('query');

3
src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
View file

@ -141,6 +141,8 @@ uiModules
self.visState
);
self.vis.savedSearchId = self.savedSearchId;
return self.vis;
};
@ -150,6 +152,7 @@ uiModules
self.vis.indexPattern = self.searchSource.getField('index');
self.visState.title = self.title;
self.vis.setState(self.visState);
self.vis.savedSearchId = self.savedSearchId;
};
return SavedVis;

2
src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
View file

@ -94,7 +94,7 @@ describe('Geohash Agg', () => {
describe('precision parameter', () => {
const PRECISION_PARAM_INDEX = 6;
const PRECISION_PARAM_INDEX = 7;
let precisionParam;
beforeEach(() => {
precisionParam = geoHashBucketAgg.params[PRECISION_PARAM_INDEX];

5
src/ui/public/agg_types/buckets/geo_hash.js
View file

@ -100,6 +100,11 @@ export const geoHashBucketAgg = new BucketAggType({
default: [0, 0],
write: _.noop
},
{
name: 'mapBounds',
default: null,
write: _.noop
},
{
name: 'precision',
editor: precisionTemplate,

4
src/ui/public/vis/agg_configs.js
View file

@ -52,7 +52,7 @@ class AggConfigs extends IndexedArray {
super({
index: ['id'],
group: ['schema.group', 'type.name', 'schema.name'],
group: ['schema.group', 'type.name', 'type.type', 'schema.name'],
});
this.indexPattern = indexPattern;
@ -152,7 +152,7 @@ class AggConfigs extends IndexedArray {
if (hierarchical) {
// collect all metrics, and filter out the ones that we won't be copying
nestedMetrics = _(this.bySchemaGroup.metrics)
nestedMetrics = _(this.byTypeType.metrics)
.filter(function (agg) {
return agg.type.name !== 'count';
})