From 7754d0d4dcedc17fdbe528b4d53ef938862fc19a Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Mon, 22 Apr 2024 22:24:39 -0500
Subject: [PATCH] XYChart2: Remove common series name from tooltip items
 (#86739)

---
 .../plugins/panel/xychart/v2/XYChartTooltip.tsx    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx b/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
index bc80bffe01f..bfc25494772 100644
--- a/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
+++ b/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
@@ -23,6 +23,14 @@ export interface Props {
   xySeries: XYSeries[];
 }
 
+function stripSeriesName(fieldName: string, seriesName: string) {
+  if (fieldName.includes(' ')) {
+    fieldName = fieldName.replace(seriesName, '').trim();
+  }
+
+  return fieldName;
+}
+
 export const XYChartTooltip = ({ dataIdxs, seriesIdx, data, xySeries, dismiss, isPinned }: Props) => {
   const styles = useStyles2(getStyles);
 
@@ -51,18 +59,18 @@ export const XYChartTooltip = ({ dataIdxs, seriesIdx, data, xySeries, dismiss, i
 
   const contentItems: VizTooltipItem[] = [
     {
-      label: xField.state?.displayName ?? xField.name,
+      label: stripSeriesName(xField.state?.displayName ?? xField.name, label),
       value: fmt(xField, xField.values[rowIndex]),
     },
     {
-      label: yField.state?.displayName ?? yField.name,
+      label: stripSeriesName(yField.state?.displayName ?? yField.name, label),
       value: fmt(yField, yField.values[rowIndex]),
     },
   ];
 
   series._rest.forEach((field) => {
     contentItems.push({
-      label: field.state?.displayName ?? field.name,
+      label: stripSeriesName(field.state?.displayName ?? field.name, label),
       value: fmt(field, field.values[rowIndex]),
     });
   });