Skip to content

Inherit commonly used data on relative tab on EuiSuperDatePicker #3106

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

Merged
thompsongl merged 6 commits into from
Mar 19, 2020
Merged

Inherit commonly used data on relative tab on EuiSuperDatePicker #3106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e9f336
fixed inherit commonly used data on relative tab
ashikmeerankutty Mar 17, 2020
7d22505
removed console statement
ashikmeerankutty Mar 17, 2020
c3c2a30
updated cl
ashikmeerankutty Mar 17, 2020
d88c2f8
Merge branch 'master' into fix2/super-date-picker
ashikmeerankutty Mar 18, 2020
03120c0
Merge branch 'master' into fix2/super-date-picker
ashikmeerankutty Mar 19, 2020
722ff24
moved cl
ashikmeerankutty Mar 19, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

**Bug Fixes**

- Fixed bug in `EuiSuperDatePicker` to show correct values of commonly used values in relative tab ([#3106](https://github.com/elastic/eui/pull/3106))
- Fixed race condition in `EuiIcon` when switching from dynamically fetched components ([#3118](https://github.com/elastic/eui/pull/3118))

## [`21.1.0`](https://github.com/elastic/eui/tree/v21.1.0)
Expand Down
5 changes: 0 additions & 5 deletions src/components/date_picker/super_date_picker/relative_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,11 @@ export function parseRelativeParts(value) {
isString(value) &&
value.match(/now(([\-\+])([0-9]+)([smhdwMy])(\/[smhdwMy])?)?/);

const isNow = matches && !matches[1];
const operator = matches && matches[2];
const count = matches && matches[3];
const unit = matches && matches[4];
const roundBy = matches && matches[5];

if (isNow) {
return { count: 0, unit: 's', round: false };
}

if (count && unit) {
const isRounded = roundBy ? true : false;
return {
Expand Down