IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

TimePicker: Support strings in ISO formats (#93479)

Browse Source 
* TimePicker: Support strings in ISO formats

* changed fix and added test
This commit is contained in:
Torkel Ödegaard 2024-09-24 17:00:15 +02:00 committed by GitHub
parent db697a3e23
commit ae5a7a53a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.test.tsx
View File

@ -76,6 +76,23 @@ describe('TimeRangeForm', () => {
expect(getByLabelText('To')).toHaveValue(toValue);
});
it('should parse UTC iso strings and render in current timezone', () => {
const { getByLabelText } = setup(
{
from: defaultTimeRange.from,
to: defaultTimeRange.to,
raw: {
from: defaultTimeRange.from.toISOString(),
to: defaultTimeRange.to.toISOString(),
},
},
'America/New_York'
);
expect(getByLabelText('From')).toHaveValue('2021-06-16 20:00:00');
expect(getByLabelText('To')).toHaveValue('2021-06-19 19:59:00');
});
it('should close calendar when clicking the close icon', () => {
const { queryByLabelText, getAllByRole, getByRole } = setup();
const { TimePicker } = selectors.components;

6
packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx
View File

@ -267,6 +267,12 @@ function valueAsString(value: DateTime | string, timeZone?: TimeZone): string {
if (isDateTime(value)) {
return dateTimeFormat(value, { timeZone });
}
if (value.endsWith('Z')) {
const dt = dateTimeParse(value, { timeZone: 'utc' });
return dateTimeFormat(dt, { timeZone });
}
return value;
}