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

Chore: parse parseDuration values as numbers (#42826)

Browse Source 
* Chore: parseDuration values as numbers

* Clean up RefreshPicker labels
This commit is contained in:
Josh Hunt 2021-12-16 11:35:53 +00:00 committed by GitHub
parent 23be398c9c
commit 609a1aa8ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-data/src/datetime/durationutil.test.ts
View File

@ -18,12 +18,12 @@ describe('Duration util', () => {
describe('parseDuration', () => {
it('parses a duration string', () => {
const durationString = '3M 5d 20m';
expect(parseDuration(durationString)).toEqual({ months: '3', days: '5', minutes: '20' });
expect(parseDuration(durationString)).toEqual({ months: 3, days: 5, minutes: 20 });
});
it('strips out non valid durations', () => {
const durationString = '3M 6v 5b 4m';
expect(parseDuration(durationString)).toEqual({ months: '3', minutes: '4' });
expect(parseDuration(durationString)).toEqual({ months: 3, minutes: 4 });
});
});

18
packages/grafana-data/src/datetime/durationutil.ts
View File

@ -35,19 +35,25 @@ export function intervalToAbbreviatedDurationString(interval: Interval, includeS
/**
* parseDuration parses duration string into datefns Duration object
*
* @param duration - string to convert. For example '2m', '5h 20s'
* @param durationString - string to convert. For example '2m', '5h 20s'
*
* @public
*/
export function parseDuration(duration: string): Duration {
return duration.split(' ').reduce<Duration>((acc, value) => {
export function parseDuration(durationString: string): Duration {
return durationString.split(' ').reduce<Duration>((acc, value) => {
const match = value.match(/(\d+)(.+)/);
if (match === null || match.length !== 3) {
const rawLength = match?.[1];
const unit = match?.[2];
if (!(rawLength && unit)) {
return acc;
}
const key = Object.entries(durationMap).find(([_, abbreviations]) => abbreviations?.includes(match[2]))?.[0];
return !key ? acc : { ...acc, [key]: match[1] };
const mapping = Object.entries(durationMap).find(([_, abbreviations]) => abbreviations?.includes(match[2]));
const length = parseInt(rawLength, 10);
return mapping ? { ...acc, [mapping[0]]: length } : acc;
}, {});
}

11
packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.test.tsx
View File

@ -35,5 +35,16 @@ describe('RefreshPicker', () => {
]);
});
});
it('should format durations with multiple units', () => {
const intervals = ['10s', '1m 30s'];
const result = intervalsToOptions({ intervals });
expect(result).toEqual([
{ value: '', label: 'Off', ariaLabel: 'Turn off auto refresh' },
{ value: '10s', label: '10s', ariaLabel: '10 seconds' },
{ value: '1m 30s', label: '1m 30s', ariaLabel: '1 minute 30 seconds' },
]);
});
});
});

7
packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx
View File

@ -102,12 +102,7 @@ export function intervalsToOptions({ intervals = defaultIntervals }: { intervals
> {
const intervalsOrDefault = intervals || defaultIntervals;
const options = intervalsOrDefault.map((interval) => {
const duration: { [key: string]: string | number } = parseDuration(interval);
const key = Object.keys(duration)[0];
const value = duration[key];
duration[key] = Number(value);
const duration = parseDuration(interval);
const ariaLabel = formatDuration(duration);
return {