From f811cbc5a73b0f3e53817fa79a1d1f0189c31af4 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 18 May 2023 01:04:34 +0200
Subject: [PATCH] [v9.5.x] Barchart: Apply field visibility to traceID (#68584)

Barchart: Apply field visibility to traceID (#68524)

(cherry picked from commit 160e207e47ca0e89dd67697c92384c2a403986b5)

Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
---
 .../app/plugins/panel/geomap/components/DataHoverView.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/geomap/components/DataHoverView.tsx b/public/app/plugins/panel/geomap/components/DataHoverView.tsx
index 5e0333951fa..00d3827e74f 100644
--- a/public/app/plugins/panel/geomap/components/DataHoverView.tsx
+++ b/public/app/plugins/panel/geomap/components/DataHoverView.tsx
@@ -40,10 +40,14 @@ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, he
   const fields = data.fields.map((f, idx) => {
     return { ...f, hovered: idx === columnIndex };
   });
-  // Put the traceID field in front.
   const visibleFields = fields.filter((f) => !Boolean(f.config.custom?.hideFrom?.tooltip));
   const traceIDField = visibleFields.find((field) => field.name === 'traceID') || fields[0];
-  const orderedVisibleFields = [traceIDField, ...visibleFields.filter((field) => traceIDField !== field)];
+  const orderedVisibleFields = [];
+  // Only include traceID if it's visible and put it in front.
+  if (visibleFields.filter((field) => traceIDField === field).length > 0) {
+    orderedVisibleFields.push(traceIDField);
+  }
+  orderedVisibleFields.push(...visibleFields.filter((field) => traceIDField !== field));
 
   if (orderedVisibleFields.length === 0) {
     return null;