From eac9cc7f6cd83416d4846c4fad5e4c3cdcf33901 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:02:45 +0300
Subject: [PATCH] [v10.0.x] BarChart: Fix legend for fields with labels
 (#71099)

---
 public/app/plugins/panel/barchart/utils.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts
index 3e48e0e3ddc..759e8cefe25 100644
--- a/public/app/plugins/panel/barchart/utils.ts
+++ b/public/app/plugins/panel/barchart/utils.ts
@@ -489,7 +489,12 @@ export function prepareBarChartDisplayValues(
   let legendFields: Field[] = fields;
   if (options.stacking === StackingMode.Percent) {
     legendFields = fields.map((field) => {
-      const alignedFrameField = frame.fields.find((f) => f.name === field.name)!;
+      const alignedFrameField = frame.fields.find((f) => {
+        if (f.labels) {
+          return f.name === field.name && f.labels.name === field.labels?.name;
+        }
+        return f.name === field.name;
+      })!;
 
       const copy = {
         ...field,