From e079e00bfb51565413c5cae26b97ba2dd8dc3eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= Date: Wed, 30 Aug 2023 16:38:54 +0200 Subject: [PATCH] Grafana-ui: Get rid of duplicated code in `TimeRangeContent` (#74112) --- .../TimeRangePicker/TimeRangeContent.tsx | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx index af28f36a475..ddcca4161c3 100644 --- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx +++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx @@ -2,7 +2,6 @@ import { css } from '@emotion/css'; import React, { FormEvent, useCallback, useEffect, useState } from 'react'; import { - dateMath, DateTime, dateTimeFormat, dateTimeParse, @@ -21,6 +20,7 @@ import { t, Trans } from '../../../utils/i18n'; import { Button } from '../../Button'; import { Field } from '../../Forms/Field'; import { Input } from '../../Input/Input'; +import { isValid } from '../utils'; import TimePickerCalendar from './TimePickerCalendar'; @@ -208,19 +208,6 @@ function valueAsString(value: DateTime | string, timeZone?: TimeZone): string { return value; } -function isValid(value: string, roundUp?: boolean, timeZone?: TimeZone): boolean { - if (isDateTime(value)) { - return value.isValid(); - } - - if (dateMath.isMathString(value)) { - return dateMath.isValid(value); - } - - const parsed = dateTimeParse(value, { roundUp, timeZone }); - return parsed.isValid(); -} - function getStyles(theme: GrafanaTheme2) { return { fieldContainer: css({