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

[savedObjects] add experimental filter capabilities #17513

Closed
wants to merge 10 commits into from
Closed

[savedObjects] add experimental filter capabilities #17513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b064cb1
[savedObjects] rename bulk_get/find apis to _bulk_get and _find
spalger Apr 2, 2018
a49b139
Merge branch 'master' of github.com:elastic/kibana into rename/saved-…
spalger Apr 4, 2018
2535b02
Merge branch 'master' of github.com:elastic/kibana into rename/saved-…
spalger Apr 5, 2018
8621667
[savedObjects] add experimental filter definition syntax
spalger Apr 3, 2018
255cf14
[savedObjects] generate queries that are aware of root properties
spalger Apr 4, 2018
95d00d1
[savedObjects/searchDsl/queryParams] test experimentalFilter arg
spalger Apr 4, 2018
764a2e0
[savedObjects/route/find] auto-convert casing for all options
spalger Apr 4, 2018
f32d8ac
Merge branch 'master' of github.com:elastic/kibana into implement/sav…
spalger Apr 6, 2018
bc2b42c
[server/savedObjects/queryParams] fix tests
spalger Apr 6, 2018
ec45281
Merge branch 'master' of github.com:elastic/kibana into implement/sav…
spalger Apr 10, 2018
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
198 changes: 198 additions & 0 deletions ...aved_objects/client/lib/search_dsl/experimental_filter/__snapshots__/convert.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`SavedObjectsClient/experimentalFilter properly converts complex example 1`] = `
Object {
"bool": Object {
"must": Array [
Object {
"bool": Object {
"should": Array [
Object {
"range": Object {
"visualize.stars": Object {
"gt": 3,
"gte": undefined,
"lt": undefined,
"lte": undefined,
},
},
},
Object {
"range": Object {
"dashboard.stars": Object {
"gt": 3,
"gte": undefined,
"lt": undefined,
"lte": undefined,
},
},
},
],
},
},
Object {
"bool": Object {
"should": Array [
Object {
"range": Object {
"visualize.followers": Object {
"gt": undefined,
"gte": undefined,
"lt": undefined,
"lte": 5,
},
},
},
Object {
"range": Object {
"dashboard.followers": Object {
"gt": undefined,
"gte": undefined,
"lt": undefined,
"lte": 5,
},
},
},
],
},
},
Object {
"range": Object {
"updated_at": Object {
"gt": undefined,
"gte": 2018-03-02T07:00:00.000Z,
"lt": 2018-03-03T07:00:00.000Z,
"lte": undefined,
},
},
},
Object {
"range": Object {
"updated_at": Object {
"gt": undefined,
"gte": 2018-02-25T07:00:00.000Z,
"lt": 2018-03-01T07:00:00.000Z,
"lte": undefined,
},
},
},
Object {
"range": Object {
"updated_at": Object {
"gt": undefined,
"gte": undefined,
"lt": 2012-01-01T07:00:00.000Z,
"lte": undefined,
},
},
},
Object {
"multi_match": Object {
"fields": undefined,
"query": "dashboard",
"type": "phrase",
},
},
Object {
"multi_match": Object {
"fields": Array [
"visualize.active",
"dashboard.active",
],
"query": true,
"type": "phrase",
},
},
Object {
"bool": Object {
"must": Array [],
"must_not": Array [],
"should": Array [
Object {
"range": Object {
"updated_at": Object {
"gt": undefined,
"gte": 2018-03-02T07:00:00.000Z,
"lt": 2018-03-03T07:00:00.000Z,
"lte": undefined,
},
},
},
Object {
"range": Object {
"updated_at": Object {
"gt": undefined,
"gte": 2018-03-01T07:00:00.000Z,
"lt": 2018-03-02T07:00:00.000Z,
"lte": undefined,
},
},
},
],
},
},
],
"must_not": Array [
Object {
"multi_match": Object {
"fields": Array [
"visualize.status",
"dashboard.status",
],
"query": "open",
"type": "phrase",
},
},
Object {
"multi_match": Object {
"fields": Array [
"visualize.owner",
"dashboard.owner",
],
"query": "dewey",
"type": "phrase",
},
},
Object {
"bool": Object {
"must": Array [],
"must_not": Array [],
"should": Array [
Object {
"multi_match": Object {
"fields": Array [
"visualize.tag",
"dashboard.tag",
],
"query": "finance",
"type": "phrase",
},
},
Object {
"multi_match": Object {
"fields": Array [
"visualize.tag",
"dashboard.tag",
],
"query": "eng",
"type": "phrase",
},
},
Object {
"multi_match": Object {
"fields": Array [
"visualize.tag",
"dashboard.tag",
],
"query": "ga",
"type": "phrase",
},
},
],
},
},
],
"should": Array [],
},
}
`;
172 changes: 172 additions & 0 deletions ...lib/search_dsl/experimental_filter/__snapshots__/parse_and_validate_from_api.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`SavedObjectsClient experimental_filter/detect_types bool detects nested filter types 1`] = `
Object {
"must": Array [
Object {
"field": "foo",
"type": "value",
"value": "bar",
},
Object {
"must": Array [],
"must_not": Array [],
"must_some": Array [
Object {
"field": "foo2",
"type": "value",
"value": "bar2",
},
Object {
"field": "foo2",
"type": "value",
"value": "bar3",
},
],
"type": "bool",
},
],
"must_not": Array [],
"must_some": Array [],
"type": "bool",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types bool detects with must and must_not 1`] = `
Object {
"must": Array [],
"must_not": Array [],
"must_some": Array [],
"type": "bool",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types bool detects with must and must_some 1`] = `
Object {
"must": Array [],
"must_not": Array [],
"must_some": Array [],
"type": "bool",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types bool detects with must_not and must_some 1`] = `
Object {
"must": Array [],
"must_not": Array [],
"must_some": Array [],
"type": "bool",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types bool detects with single must 1`] = `
Object {
"must": Array [],
"must_not": Array [],
"must_some": Array [],
"type": "bool",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types bool detects with single must_not 1`] = `
Object {
"must": Array [],
"must_not": Array [],
"must_some": Array [],
"type": "bool",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types bool detects with single must_some 1`] = `
Object {
"must": Array [],
"must_not": Array [],
"must_some": Array [],
"type": "bool",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors if gt and gte combined 1`] = `"Invalid range filter: \\"gt\\" must not exist simultaneously with [gte]"`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors if gt and must combined 1`] = `"Filter property \\"must\\" can't be used with properties \\"field\\" and \\"gt\\""`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors if gt and value combined 1`] = `"Filter property \\"value\\" can't be used with properties \\"field\\" and \\"gt\\""`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors if only field 1`] = `"Unable to determine filter type when only specifying property \\"field\\""`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors with gt and lt 1`] = `"Invalid range filter: child \\"field\\" fails because [\\"field\\" is required]"`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors with just gt 1`] = `"Invalid range filter: child \\"field\\" fails because [\\"field\\" is required]"`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors with just gte 1`] = `"Invalid range filter: child \\"field\\" fails because [\\"field\\" is required]"`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors with just lt 1`] = `"Invalid range filter: child \\"field\\" fails because [\\"field\\" is required]"`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors with just lte 1`] = `"Invalid range filter: child \\"field\\" fails because [\\"field\\" is required]"`;

exports[`SavedObjectsClient experimental_filter/detect_types errors errors with lte and gt 1`] = `"Invalid range filter: child \\"field\\" fails because [\\"field\\" is required]"`;

exports[`SavedObjectsClient experimental_filter/detect_types range detects with gt and field 1`] = `
Object {
"field": "foo",
"gt": 100,
"type": "range",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types range detects with gt, lt and field 1`] = `
Object {
"field": "foo",
"gt": 100,
"lt": 100,
"type": "range",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types range detects with gte and field 1`] = `
Object {
"field": "foo",
"gte": 100,
"type": "range",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types range detects with lt and field 1`] = `
Object {
"field": "foo",
"lt": 10,
"type": "range",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types range detects with lte and field 1`] = `
Object {
"field": "foo",
"lte": 100,
"type": "range",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types range detects with lte, gt and field 1`] = `
Object {
"field": "foo",
"gt": 100,
"lte": 100,
"type": "range",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types value detects with just value 1`] = `
Object {
"type": "value",
"value": "foo",
}
`;

exports[`SavedObjectsClient experimental_filter/detect_types value detects with value and field 1`] = `
Object {
"field": "foo",
"type": "value",
"value": "bar",
}
`;
Loading