From 68597e8cfbccb7ef0cc0223ddc230a4e9bfac2f9 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Mon, 8 Feb 2021 17:24:47 +0100
Subject: [PATCH] StatPanel: Fixes issue formatting date values using unit
 option (#30979) (#30991)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 907d3a2aac17139107b7cfee7fb8b2f1b3da1732)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
---
 packages/grafana-data/src/field/displayProcessor.ts | 5 +++--
 packages/grafana-ui/src/utils/standardEditors.tsx   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/grafana-data/src/field/displayProcessor.ts b/packages/grafana-data/src/field/displayProcessor.ts
index 71bde8b25df..19839d862b8 100644
--- a/packages/grafana-data/src/field/displayProcessor.ts
+++ b/packages/grafana-data/src/field/displayProcessor.ts
@@ -27,9 +27,10 @@ interface DisplayProcessorOptions {
 // Reasonable units for time
 const timeFormats: KeyValue<boolean> = {
   dateTimeAsIso: true,
-  dateTimeAsIsoSmart: true,
+  dateTimeAsIsoNoDateIfToday: true,
   dateTimeAsUS: true,
-  dateTimeAsUSSmart: true,
+  dateTimeAsUSNoDateIfToday: true,
+  dateTimeAsLocal: true,
   dateTimeFromNow: true,
 };
 
diff --git a/packages/grafana-ui/src/utils/standardEditors.tsx b/packages/grafana-ui/src/utils/standardEditors.tsx
index c048ed3de8b..8b42780a158 100644
--- a/packages/grafana-ui/src/utils/standardEditors.tsx
+++ b/packages/grafana-ui/src/utils/standardEditors.tsx
@@ -77,7 +77,7 @@ export const getStandardFieldConfigs = () => {
       placeholder: 'none',
     },
 
-    shouldApply: (field) => field.type === FieldType.number,
+    shouldApply: () => true,
     category,
   };