From 636be0ed22335c8725412f5832a5bb20fa1c3eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Mon, 29 Mar 2021 14:36:01 +0200
Subject: [PATCH] TimeSeries: Fixes issue with time x-axis and hour ticks that
 stretches across more than one day (#32389)

* TimeSeries: Fixes issue with time x-axis and hour ticks that stretches across more than one day

* Fixed logic
---
 packages/grafana-ui/src/components/Graph/utils.ts             | 4 ++--
 .../src/components/uPlot/config/UPlotAxisBuilder.ts           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-ui/src/components/Graph/utils.ts b/packages/grafana-ui/src/components/Graph/utils.ts
index 1ce80c184cd..3bd1c858a49 100644
--- a/packages/grafana-ui/src/components/Graph/utils.ts
+++ b/packages/grafana-ui/src/components/Graph/utils.ts
@@ -123,13 +123,13 @@ export const graphTimeFormat = (ticks: number | null, min: number | null, max: n
     if (secPerTick <= 45) {
       return systemDateFormats.interval.second;
     }
-    if (secPerTick <= 7200 || range <= oneDay) {
+    if (range <= oneDay) {
       return systemDateFormats.interval.minute;
     }
     if (secPerTick <= 80000) {
       return systemDateFormats.interval.hour;
     }
-    if (secPerTick <= 2419200 || range <= oneYear) {
+    if (range <= oneYear) {
       return systemDateFormats.interval.day;
     }
     if (secPerTick <= 31536000) {
diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
index 49b1b2eac64..b200ae21879 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts
@@ -163,11 +163,11 @@ function formatTime(self: uPlot, splits: number[], axisIdx: number, foundSpace:
     format = systemDateFormats.interval.second.replace('ss', 'ss.SS');
   } else if (foundIncr <= timeUnitSize.minute) {
     format = systemDateFormats.interval.second;
-  } else if (foundIncr <= timeUnitSize.hour || range <= timeUnitSize.day) {
+  } else if (range <= timeUnitSize.day) {
     format = systemDateFormats.interval.minute;
   } else if (foundIncr <= timeUnitSize.day) {
     format = systemDateFormats.interval.hour;
-  } else if (foundIncr <= timeUnitSize.month || range < timeUnitSize.year) {
+  } else if (range < timeUnitSize.year) {
     format = systemDateFormats.interval.day;
   } else if (incrementRoundedToDay === yearRoundedToDay) {
     format = systemDateFormats.interval.year;