From d227353321d384e5faa346f650a687f85c1ecbd7 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus.andersson@grafana.com>
Date: Thu, 5 Mar 2020 13:14:42 +0100
Subject: [PATCH] Fix: when reloading page make sure that time picker history
 is converted to dateTime.

---
 .../TimePicker/TimePickerWithHistory.tsx      | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
index c8ad006fc6d..6ce07a77b05 100644
--- a/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
+++ b/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { LocalStorageValueProvider } from '../LocalStorageValueProvider';
-import { TimeRange, isDateTime } from '@grafana/data';
+import { TimeRange, isDateTime, dateTime } from '@grafana/data';
 import { Props as TimePickerProps, TimePicker } from '@grafana/ui/src/components/TimePicker/TimePicker';
 
 const LOCAL_STORAGE_KEY = 'grafana.dashboard.timepicker.history';
@@ -14,7 +14,7 @@ export const TimePickerWithHistory: React.FC<Props> = props => {
         return (
           <TimePicker
             {...props}
-            history={values}
+            history={convertIfJson(values)}
             onChange={value => {
               onAppendToHistory(value, values, onSaveToStore);
               props.onChange(value);
@@ -25,6 +25,21 @@ export const TimePickerWithHistory: React.FC<Props> = props => {
     </LocalStorageValueProvider>
   );
 };
+
+function convertIfJson(history: TimeRange[]): TimeRange[] {
+  return history.map(time => {
+    if (isDateTime(time.from)) {
+      return time;
+    }
+
+    return {
+      from: dateTime(time.from),
+      to: dateTime(time.to),
+      raw: time.raw,
+    };
+  });
+}
+
 function onAppendToHistory(toAppend: TimeRange, values: TimeRange[], onSaveToStore: (values: TimeRange[]) => void) {
   if (!isAbsolute(toAppend)) {
     return;