From e93640878d4b1b6f348977315368bea69ebe9904 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Wed, 1 Jul 2020 09:07:44 +0200
Subject: [PATCH] Explore/Tooltip: Fix label value in tooltip (#25940)

* Fix value name in tooltip

* Fallback to field.name

* Use getFieldDisplayName method
---
 .../components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx   | 3 ++-
 packages/grafana-ui/src/components/Graph/utils.ts              | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx b/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
index 4e0c945e0a3..c20536e7409 100644
--- a/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
+++ b/packages/grafana-ui/src/components/Graph/GraphTooltip/SingleModeGraphTooltip.tsx
@@ -4,6 +4,7 @@ import {
   getColumnFromDimension,
   formattedValueToString,
   getDisplayProcessor,
+  getFieldDisplayName,
 } from '@grafana/data';
 import { SeriesTable } from './SeriesTable';
 import { GraphTooltipContentProps } from './types';
@@ -36,7 +37,7 @@ export const SingleModeGraphTooltip: React.FC<GraphTooltipContentProps> = ({
       series={[
         {
           color: disp.color,
-          label: valueField.name,
+          label: getFieldDisplayName(valueField),
           value: formattedValueToString(disp),
         },
       ]}
diff --git a/packages/grafana-ui/src/components/Graph/utils.ts b/packages/grafana-ui/src/components/Graph/utils.ts
index 1b5983fc306..1b107755aec 100644
--- a/packages/grafana-ui/src/components/Graph/utils.ts
+++ b/packages/grafana-ui/src/components/Graph/utils.ts
@@ -3,6 +3,7 @@ import {
   Field,
   formattedValueToString,
   getDisplayProcessor,
+  getFieldDisplayName,
   TimeZone,
   dateTimeFormat,
 } from '@grafana/data';
@@ -91,7 +92,7 @@ export const getMultiSeriesGraphHoverInfo = (
       datapointIndex: hoverIndex,
       seriesIndex: i,
       color: disp.color,
-      label: field.name,
+      label: getFieldDisplayName(field),
       time: time.display ? formattedValueToString(time.display(pointTime)) : pointTime,
     });
   }