-
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.
Merge branch 'master' into feature-create-enrollment-token-all-configs
- Loading branch information
Showing
139 changed files
with
4,035 additions
and
1,650 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
28 changes: 28 additions & 0 deletions
28
src/plugins/data/public/query/timefilter/lib/validate_timerange.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,28 @@ | ||
| /* | ||
| * 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 dateMath from '@elastic/datemath'; | ||
| import { TimeRange } from '../../../../common'; | ||
|
|
||
| export function validateTimeRange(time?: TimeRange): boolean { | ||
| if (!time) return false; | ||
| const momentDateFrom = dateMath.parse(time.from); | ||
| const momentDateTo = dateMath.parse(time.to); | ||
| return !!(momentDateFrom && momentDateFrom.isValid() && momentDateTo && momentDateTo.isValid()); | ||
| } |
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
84 changes: 84 additions & 0 deletions
84
src/plugins/ui_actions/public/context_menu/open_context_menu.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,84 @@ | ||
| /* | ||
| * 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 { createInteractionPositionTracker } from './open_context_menu'; | ||
| import { fireEvent } from '@testing-library/dom'; | ||
|
|
||
| let targetEl: Element; | ||
| const top = 100; | ||
| const left = 100; | ||
| const right = 200; | ||
| const bottom = 200; | ||
| beforeEach(() => { | ||
| targetEl = document.createElement('div'); | ||
| jest.spyOn(targetEl, 'getBoundingClientRect').mockImplementation(() => ({ | ||
| top, | ||
| left, | ||
| right, | ||
| bottom, | ||
| width: right - left, | ||
| height: bottom - top, | ||
| x: left, | ||
| y: top, | ||
| toJSON: () => {}, | ||
| })); | ||
| document.body.append(targetEl); | ||
| }); | ||
| afterEach(() => { | ||
| targetEl.remove(); | ||
| }); | ||
|
|
||
| test('should use last clicked element position if mouse position is outside target element', () => { | ||
| const { resolveLastPosition } = createInteractionPositionTracker(); | ||
|
|
||
| fireEvent.click(targetEl, { clientX: 0, clientY: 0 }); | ||
| const { x, y } = resolveLastPosition(); | ||
|
|
||
| expect(y).toBe(bottom); | ||
| expect(x).toBe(left + (right - left) / 2); | ||
| }); | ||
|
|
||
| test('should use mouse position if mouse inside clicked element', () => { | ||
| const { resolveLastPosition } = createInteractionPositionTracker(); | ||
|
|
||
| const mouseX = 150; | ||
| const mouseY = 150; | ||
| fireEvent.click(targetEl, { clientX: mouseX, clientY: mouseY }); | ||
|
|
||
| const { x, y } = resolveLastPosition(); | ||
|
|
||
| expect(y).toBe(mouseX); | ||
| expect(x).toBe(mouseY); | ||
| }); | ||
|
|
||
| test('should use position of previous element, if latest element is no longer in DOM', () => { | ||
| const { resolveLastPosition } = createInteractionPositionTracker(); | ||
|
|
||
| const detachedElement = document.createElement('div'); | ||
| const spy = jest.spyOn(detachedElement, 'getBoundingClientRect'); | ||
|
|
||
| fireEvent.click(targetEl); | ||
| fireEvent.click(detachedElement); | ||
|
|
||
| const { x, y } = resolveLastPosition(); | ||
|
|
||
| expect(y).toBe(bottom); | ||
| expect(x).toBe(left + (right - left) / 2); | ||
| expect(spy).not.toBeCalled(); | ||
| }); |
Oops, something went wrong.