-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Discover] Deangularize timechart header (#66532)
* Deangularize timechart header * Add label attr to options * Watch the interval prop change * Tweaking the UI Mainly moved interval notice to an `append` and copy updates * Remove outdated i18n tokens * fix functional test * Change functional test due to dom changes * fix functional test * remove unecessary translation * remove watcher as it is not necessary anymore * change interval options copies Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: cchaos <caroline.horn@elastic.co>
- Loading branch information
3 people
committed
May 20, 2020
1 parent
3ce0b57
commit 42d21bc
Showing
14 changed files
with
342 additions
and
97 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
21 changes: 21 additions & 0 deletions
21
src/plugins/discover/public/application/components/timechart_header/index.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,21 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| export { TimechartHeader } from './timechart_header'; | ||
| export { createTimechartHeaderDirective } from './timechart_header_directive'; |
95 changes: 95 additions & 0 deletions
95
...plugins/discover/public/application/components/timechart_header/timechart_header.test.tsx
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,95 @@ | ||
| /* | ||
| * 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 React from 'react'; | ||
| import { mountWithIntl } from 'test_utils/enzyme_helpers'; | ||
| import { ReactWrapper } from 'enzyme'; | ||
| import { TimechartHeader, TimechartHeaderProps } from './timechart_header'; | ||
| import { EuiIconTip } from '@elastic/eui'; | ||
| // @ts-ignore | ||
| import { findTestSubject } from '@elastic/eui/lib/test'; | ||
|
|
||
| describe('timechart header', function() { | ||
| let props: TimechartHeaderProps; | ||
| let component: ReactWrapper<TimechartHeaderProps>; | ||
|
|
||
| beforeAll(() => { | ||
| props = { | ||
| from: 'May 14, 2020 @ 11:05:13.590', | ||
| to: 'May 14, 2020 @ 11:20:13.590', | ||
| stateInterval: 's', | ||
| options: [ | ||
| { | ||
| display: 'Auto', | ||
| val: 'auto', | ||
| }, | ||
| { | ||
| display: 'Millisecond', | ||
| val: 'ms', | ||
| }, | ||
| { | ||
| display: 'Second', | ||
| val: 's', | ||
| }, | ||
| ], | ||
| onChangeInterval: jest.fn(), | ||
| showScaledInfo: undefined, | ||
| bucketIntervalDescription: 'second', | ||
| bucketIntervalScale: undefined, | ||
| }; | ||
| }); | ||
|
|
||
| it('TimechartHeader not renders an info text when the showScaledInfo property is not provided', () => { | ||
| component = mountWithIntl(<TimechartHeader {...props} />); | ||
| expect(component.find(EuiIconTip).length).toBe(0); | ||
| }); | ||
|
|
||
| it('TimechartHeader renders an info text by providing the showScaledInfo property', () => { | ||
| props.showScaledInfo = true; | ||
| component = mountWithIntl(<TimechartHeader {...props} />); | ||
| expect(component.find(EuiIconTip).length).toBe(1); | ||
| }); | ||
|
|
||
| it('expect to render the date range', function() { | ||
| component = mountWithIntl(<TimechartHeader {...props} />); | ||
| const datetimeRangeText = findTestSubject(component, 'discoverIntervalDateRange'); | ||
| expect(datetimeRangeText.text()).toBe( | ||
| 'May 14, 2020 @ 11:05:13.590 - May 14, 2020 @ 11:20:13.590 per' | ||
| ); | ||
| }); | ||
|
|
||
| it('expects to render a dropdown with the interval options', () => { | ||
| component = mountWithIntl(<TimechartHeader {...props} />); | ||
| const dropdown = findTestSubject(component, 'discoverIntervalSelect'); | ||
| expect(dropdown.length).toBe(1); | ||
| // @ts-ignore | ||
| const values = dropdown.find('option').map(option => option.prop('value')); | ||
| expect(values).toEqual(['auto', 'ms', 's']); | ||
| // @ts-ignore | ||
| const labels = dropdown.find('option').map(option => option.text()); | ||
| expect(labels).toEqual(['Auto', 'Millisecond', 'Second']); | ||
| }); | ||
|
|
||
| it('should change the interval', function() { | ||
| component = mountWithIntl(<TimechartHeader {...props} />); | ||
| findTestSubject(component, 'discoverIntervalSelect').simulate('change', { | ||
| target: { value: 'ms' }, | ||
| }); | ||
| expect(props.onChangeInterval).toHaveBeenCalled(); | ||
| }); | ||
| }); |
Oops, something went wrong.