-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
204 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
src/plugins/data/public/search/aggs/buckets/filters_fn.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { functionWrapper } from '../test_helpers'; | ||
| import { aggFilters } from './filters_fn'; | ||
|
|
||
| describe('agg_expression_functions', () => { | ||
| describe('aggFilters', () => { | ||
| const fn = functionWrapper(aggFilters()); | ||
|
|
||
| test('fills in defaults when only required args are provided', () => { | ||
| const actual = fn({}); | ||
| expect(actual).toMatchInlineSnapshot(` | ||
| Object { | ||
| "type": "agg_type", | ||
| "value": Object { | ||
| "enabled": true, | ||
| "id": undefined, | ||
| "params": Object { | ||
| "filters": undefined, | ||
| "json": undefined, | ||
| }, | ||
| "schema": undefined, | ||
| "type": "filters", | ||
| }, | ||
| } | ||
| `); | ||
| }); | ||
|
|
||
| test('includes optional params when they are provided', () => { | ||
| const actual = fn({ | ||
| filters: JSON.stringify([ | ||
| { | ||
| query: 'query', | ||
| language: 'lucene', | ||
| label: 'test', | ||
| }, | ||
| ]), | ||
| }); | ||
|
|
||
| expect(actual.value).toMatchInlineSnapshot(` | ||
| Object { | ||
| "enabled": true, | ||
| "id": undefined, | ||
| "params": Object { | ||
| "filters": Array [ | ||
| Object { | ||
| "label": "test", | ||
| "language": "lucene", | ||
| "query": "query", | ||
| }, | ||
| ], | ||
| "json": undefined, | ||
| }, | ||
| "schema": undefined, | ||
| "type": "filters", | ||
| } | ||
| `); | ||
| }); | ||
|
|
||
| test('correctly parses json string argument', () => { | ||
| const actual = fn({ | ||
| json: '{ "foo": true }', | ||
| }); | ||
|
|
||
| expect(actual.value.params.json).toEqual({ foo: true }); | ||
|
|
||
| expect(() => { | ||
| fn({ | ||
| json: '/// intentionally malformed json ///', | ||
| }); | ||
| }).toThrowErrorMatchingInlineSnapshot(`"Unable to parse json argument string"`); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import { i18n } from '@kbn/i18n'; | ||
| import { Assign } from '@kbn/utility-types'; | ||
| import { ExpressionFunctionDefinition } from '../../../../../expressions/public'; | ||
| import { AggExpressionType, AggExpressionFunctionArgs, BUCKET_TYPES } from '../'; | ||
| import { getParsedValue } from '../utils/get_parsed_value'; | ||
|
|
||
| const fnName = 'aggFilters'; | ||
|
|
||
| type Input = any; | ||
| type AggArgs = AggExpressionFunctionArgs<typeof BUCKET_TYPES.FILTERS>; | ||
|
|
||
| type Arguments = Assign<AggArgs, { filters?: string }>; | ||
|
|
||
| type Output = AggExpressionType; | ||
| type FunctionDefinition = ExpressionFunctionDefinition<typeof fnName, Input, Arguments, Output>; | ||
|
|
||
| export const aggFilters = (): FunctionDefinition => ({ | ||
| name: fnName, | ||
| help: i18n.translate('data.search.aggs.function.buckets.filters.help', { | ||
| defaultMessage: 'Generates a serialized agg config for a Filter agg', | ||
| }), | ||
| type: 'agg_type', | ||
| args: { | ||
| id: { | ||
| types: ['string'], | ||
| help: i18n.translate('data.search.aggs.buckets.filters.id.help', { | ||
| defaultMessage: 'ID for this aggregation', | ||
| }), | ||
| }, | ||
| enabled: { | ||
| types: ['boolean'], | ||
| default: true, | ||
| help: i18n.translate('data.search.aggs.buckets.filters.enabled.help', { | ||
| defaultMessage: 'Specifies whether this aggregation should be enabled', | ||
| }), | ||
| }, | ||
| schema: { | ||
| types: ['string'], | ||
| help: i18n.translate('data.search.aggs.buckets.filters.schema.help', { | ||
| defaultMessage: 'Schema to use for this aggregation', | ||
| }), | ||
| }, | ||
| filters: { | ||
| types: ['string'], | ||
| required: false, | ||
| help: i18n.translate('data.search.aggs.buckets.filters.filters.help', { | ||
| defaultMessage: 'Filters to use for this aggregation', | ||
| }), | ||
| }, | ||
| json: { | ||
| types: ['string'], | ||
| help: i18n.translate('data.search.aggs.buckets.filters.json.help', { | ||
| defaultMessage: 'Advanced json to include when the agg is sent to Elasticsearch', | ||
| }), | ||
| }, | ||
| }, | ||
| fn: (input, args) => { | ||
| const { id, enabled, schema, ...rest } = args; | ||
|
|
||
| return { | ||
| type: 'agg_type', | ||
| value: { | ||
| id, | ||
| enabled, | ||
| schema, | ||
| type: BUCKET_TYPES.FILTERS, | ||
| params: { | ||
| ...rest, | ||
| filters: getParsedValue(args, 'filters'), | ||
| json: getParsedValue(args, 'json'), | ||
| }, | ||
| }, | ||
| }; | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters