Skip to content
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

EuiSuperDatePicker: add seconds unit option to refresh interval #1503

Merged
merged 2 commits into from
Jan 31, 2019
Merged

EuiSuperDatePicker: add seconds unit option to refresh interval #1503

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc055d0
add seconds unit option to refresh interval
thompsongl Jan 31, 2019
498f93f
#1503 changelog entry
thompsongl Jan 31, 2019
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
32 changes: 23 additions & 9 deletions src/components/date_picker/super_date_picker/quick_select_popover/refresh_interval.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import React, { Component, Fragment } from 'react';
import { timeUnits } from '../time_units';
import { timeUnits, timeUnitsPlural } from '../time_units';

import { EuiFlexGroup, EuiFlexItem } from '../../../flex';
import { EuiTitle } from '../../../title';
Expand All @@ -10,13 +10,14 @@ import { EuiButton } from '../../../button';

const refreshUnitsOptions = Object.keys(timeUnits)
.filter(timeUnit => {
return timeUnit === 'h' || timeUnit === 'm';
return timeUnit === 'h' || timeUnit === 'm' || timeUnit === 's';
})
.map(timeUnit => {
return { value: timeUnit, text: `${timeUnits[timeUnit]}s` };
return { value: timeUnit, text: timeUnitsPlural[timeUnit] };
});

const MILLISECONDS_IN_MINUTE = 1000 * 60;
const MILLISECONDS_IN_SECOND = 1000;
const MILLISECONDS_IN_MINUTE = MILLISECONDS_IN_SECOND * 60;
const MILLISECONDS_IN_HOUR = MILLISECONDS_IN_MINUTE * 60;

function fromMilliseconds(milliseconds) {
Expand All @@ -30,16 +31,29 @@ function fromMilliseconds(milliseconds) {
};
}

if (milliseconds > MILLISECONDS_IN_MINUTE) {
return {
units: 'm',
value: round(milliseconds / MILLISECONDS_IN_MINUTE)
};
}

return {
units: 'm',
value: round(milliseconds / MILLISECONDS_IN_MINUTE)
units: 's',
value: round(milliseconds / MILLISECONDS_IN_SECOND)
};
}

function toMilliseconds(units, value) {
return units === 'h'
? Math.round(value * MILLISECONDS_IN_HOUR)
: Math.round(value * MILLISECONDS_IN_MINUTE);
switch (units) {
case 'h':
return Math.round(value * MILLISECONDS_IN_HOUR);
case 'm':
return Math.round(value * MILLISECONDS_IN_MINUTE);
case 's':
default:
return Math.round(value * MILLISECONDS_IN_SECOND);
}
}

export class EuiRefreshInterval extends Component {
Expand Down