From 901495a54ae36ecafb2ef5bd45ac07b2c8f03bb4 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Wed, 5 Jul 2023 14:54:10 -0500
Subject: [PATCH] BarChart: Fix legend for fields with labels (#71098)

---
 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 5bef200938e..e05169995ee 100644
--- a/public/app/plugins/panel/barchart/utils.ts
+++ b/public/app/plugins/panel/barchart/utils.ts
@@ -475,7 +475,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,