From 283cdc184e74c2d9d2e957a920636ce013546c20 Mon Sep 17 00:00:00 2001
From: Nathan Marrs <nathanielmarrs@gmail.com>
Date: Fri, 23 Dec 2022 11:42:53 -0700
Subject: [PATCH] Barchart: Fix tooltip erroneous header (#60741)

---
 .../panel/geomap/components/DataHoverRow.tsx      |  2 +-
 .../panel/geomap/components/DataHoverView.tsx     | 15 ++++-----------
 .../plugins/panel/heatmap/HeatmapHoverView.tsx    |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/public/app/plugins/panel/geomap/components/DataHoverRow.tsx b/public/app/plugins/panel/geomap/components/DataHoverRow.tsx
index 0aaf6a32f9a..5c8a38a6480 100644
--- a/public/app/plugins/panel/geomap/components/DataHoverRow.tsx
+++ b/public/app/plugins/panel/geomap/components/DataHoverRow.tsx
@@ -24,5 +24,5 @@ export const DataHoverRow = ({ feature }: Props) => {
     data = new ArrayDataFrame([properties]);
   }
 
-  return <DataHoverView data={data} rowIndex={rowIndex} displayExemplarHeader={false} />;
+  return <DataHoverView data={data} rowIndex={rowIndex} />;
 };
diff --git a/public/app/plugins/panel/geomap/components/DataHoverView.tsx b/public/app/plugins/panel/geomap/components/DataHoverView.tsx
index b0c50e6f442..9b214c21498 100644
--- a/public/app/plugins/panel/geomap/components/DataHoverView.tsx
+++ b/public/app/plugins/panel/geomap/components/DataHoverView.tsx
@@ -19,17 +19,10 @@ export interface Props {
   columnIndex?: number | null; // the hover column
   sortOrder?: SortOrder;
   mode?: TooltipDisplayMode | null;
-  displayExemplarHeader?: boolean;
+  header?: string;
 }
 
-export const DataHoverView = ({
-  data,
-  rowIndex,
-  columnIndex,
-  sortOrder,
-  mode,
-  displayExemplarHeader = true,
-}: Props) => {
+export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, header = undefined }: Props) => {
   const styles = useStyles2(getStyles);
 
   if (!data || rowIndex == null) {
@@ -70,9 +63,9 @@ export const DataHoverView = ({
 
   return (
     <div className={styles.wrapper}>
-      {displayExemplarHeader && (
+      {header && (
         <div className={styles.header}>
-          <span className={styles.title}>Exemplar</span>
+          <span className={styles.title}>{header}</span>
         </div>
       )}
       <table className={styles.infoWrap}>
diff --git a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx b/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
index 79733b54a1f..f22f5dcd3f0 100644
--- a/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapHoverView.tsx
@@ -28,7 +28,7 @@ type Props = {
 
 export const HeatmapHoverView = (props: Props) => {
   if (props.hover.seriesIdx === 2) {
-    return <DataHoverView data={props.data.exemplars} rowIndex={props.hover.dataIdx} />;
+    return <DataHoverView data={props.data.exemplars} rowIndex={props.hover.dataIdx} header={'Exemplar'} />;
   }
   return <HeatmapHoverCell {...props} />;
 };