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

[Maps] set filter.meta.key to geoFieldName so query passes filterMatchesIndex when ignoreFilterIfFieldNotInIndex is true (#56692) (#57250)

Browse source 
* [Maps] set filter.meta.key to geoFieldName so query passes filterMatchesIndex

* remove unused variable

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Nathan Reese 2020-02-12 06:12:07 -07:00 • committed by GitHub
parent 530d8c25ec
commit 1de83bd387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.test.ts
View file

@ -24,6 +24,7 @@ describe('mapSpatialFilter()', () => {
test('should return the key for matching multi polygon filter', async () => {
const filter = {
meta: {
key: 'location',
alias: 'my spatial filter',
type: esFilters.FILTERS.SPATIAL_FILTER,
} as esFilters.FilterMeta,
@ -41,7 +42,7 @@ describe('mapSpatialFilter()', () => {
} as esFilters.Filter;
const result = mapSpatialFilter(filter);
expect(result).toHaveProperty('key', 'query');
expect(result).toHaveProperty('key', 'location');
expect(result).toHaveProperty('value', '');
expect(result).toHaveProperty('type', esFilters.FILTERS.SPATIAL_FILTER);
});
@ -49,6 +50,7 @@ describe('mapSpatialFilter()', () => {
test('should return the key for matching polygon filter', async () => {
const filter = {
meta: {
key: 'location',
alias: 'my spatial filter',
type: esFilters.FILTERS.SPATIAL_FILTER,
} as esFilters.FilterMeta,
@ -58,7 +60,7 @@ describe('mapSpatialFilter()', () => {
} as esFilters.Filter;
const result = mapSpatialFilter(filter);
expect(result).toHaveProperty('key', 'geo_polygon');
expect(result).toHaveProperty('key', 'location');
expect(result).toHaveProperty('value', '');
expect(result).toHaveProperty('type', esFilters.FILTERS.SPATIAL_FILTER);
});
@ -66,6 +68,7 @@ describe('mapSpatialFilter()', () => {
test('should return undefined for none matching', async done => {
const filter = {
meta: {
key: 'location',
alias: 'my spatial filter',
} as esFilters.FilterMeta,
geo_polygon: {

8
src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts
View file

@ -20,18 +20,14 @@ import { esFilters } from '../../../../../common';
// Use mapSpatialFilter mapper to avoid bloated meta with value and params for spatial filters.
export const mapSpatialFilter = (filter: esFilters.Filter) => {
const metaProperty = /(^\$|meta)/;
const key = Object.keys(filter).find(item => {
return !item.match(metaProperty);
});
if (
key &&
filter.meta &&
filter.meta.key &&
filter.meta.alias &&
filter.meta.type === esFilters.FILTERS.SPATIAL_FILTER
) {
return {
key,
key: filter.meta.key,
type: filter.meta.type,
value: '',
};

1
x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.js
View file

@ -297,6 +297,7 @@ function createGeometryFilterWithMeta({
type: SPATIAL_FILTER_TYPE,
negate: false,
index: indexPatternId,
key: geoFieldName,
alias: `${geoFieldName} ${relationLabel} ${geometryLabel}`,
};