From dc4007e7bda18dc3dddf2dcb0d1ede534fbaa77f Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 1 Jul 2021 14:00:45 +0200 Subject: [PATCH] TimeSeries: Fixes x-axis time format when tick increment is larger than a year (#36335) (#36348) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * TimeSeries: Fixes x-axis time format when tick increment is larger than a year * removed modal change * removed modal change (cherry picked from commit f152180dc34bd1a1c1579c4eb61c1cf01f72c786) Co-authored-by: Torkel Ödegaard --- .../grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts index 152fbdf4e78..ebd8dc911d6 100644 --- a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts +++ b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts @@ -170,7 +170,7 @@ function formatTime(self: uPlot, splits: number[], axisIdx: number, foundSpace: const yearRoundedToDay = Math.round(timeUnitSize.year / timeUnitSize.day) * timeUnitSize.day; const incrementRoundedToDay = Math.round(foundIncr / timeUnitSize.day) * timeUnitSize.day; - let format = systemDateFormats.interval.minute; + let format = systemDateFormats.interval.year; if (foundIncr < timeUnitSize.second) { format = systemDateFormats.interval.second.replace('ss', 'ss.SS');