Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Feb 12, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -41,14 +42,15 @@ 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);
});

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,
Expand All @@ -58,14 +60,15 @@ 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);
});

test('should return undefined for none matching', async done => {
const filter = {
meta: {
key: 'location',
alias: 'my spatial filter',
} as esFilters.FilterMeta,
geo_polygon: {
Expand Down
8 changes: 2 additions & 6 deletions src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: '',
};
Expand Down
1 change: 1 addition & 0 deletions x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ function createGeometryFilterWithMeta({
type: SPATIAL_FILTER_TYPE,
negate: false,
index: indexPatternId,
key: geoFieldName,
alias: `${geoFieldName} ${relationLabel} ${geometryLabel}`,
};

Expand Down