-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into filebeat_notice
- Loading branch information
Showing
63 changed files
with
1,475 additions
and
1,191 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
46 changes: 46 additions & 0 deletions
46
src/plugins/data/public/search/es_search/get_es_preference.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,46 @@ | ||
| /* | ||
| * 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 { getEsPreference } from './get_es_preference'; | ||
|
|
||
| jest.useFakeTimers(); | ||
|
|
||
| describe('Get ES preference', () => { | ||
| test('returns the session ID if set to sessionId', () => { | ||
| const setPreference = 'sessionId'; | ||
| const customPreference = 'foobar'; | ||
| const sessionId = 'my_session_id'; | ||
| const preference = getEsPreference(setPreference, customPreference, sessionId); | ||
| expect(preference).toBe(sessionId); | ||
| }); | ||
|
|
||
| test('returns the custom preference if set to custom', () => { | ||
| const setPreference = 'custom'; | ||
| const customPreference = 'foobar'; | ||
| const preference = getEsPreference(setPreference, customPreference); | ||
| expect(preference).toBe(customPreference); | ||
| }); | ||
|
|
||
| test('returns undefined if set to none', () => { | ||
| const setPreference = 'none'; | ||
| const customPreference = 'foobar'; | ||
| const preference = getEsPreference(setPreference, customPreference); | ||
| expect(preference).toBe(undefined); | ||
| }); | ||
| }); |
29 changes: 29 additions & 0 deletions
29
src/plugins/data/public/search/es_search/get_es_preference.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,29 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| const defaultSessionId = `${Date.now()}`; | ||
|
|
||
| export function getEsPreference( | ||
| setRequestPreference: string, | ||
| customRequestPreference?: string, | ||
| sessionId: string = defaultSessionId | ||
| ) { | ||
| if (setRequestPreference === 'sessionId') return `${sessionId}`; | ||
| return setRequestPreference === 'custom' ? customRequestPreference : undefined; | ||
| } |
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
Oops, something went wrong.