From 97e2837d7c28199fb73a73edcd8c54c4a4c0ee82 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 13 May 2020 04:12:08 -0700
Subject: [PATCH] Transformers: fix binary operation (#24604)

* check the display name

* remove unchanged line

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
---
 .../src/transformations/transformers/calculateField.ts         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-data/src/transformations/transformers/calculateField.ts b/packages/grafana-data/src/transformations/transformers/calculateField.ts
index 99daf725eaa..6f481a470a6 100644
--- a/packages/grafana-data/src/transformations/transformers/calculateField.ts
+++ b/packages/grafana-data/src/transformations/transformers/calculateField.ts
@@ -10,6 +10,7 @@ import { seriesToColumnsTransformer } from './seriesToColumns';
 import { getTimeField } from '../../dataframe/processDataFrame';
 import defaults from 'lodash/defaults';
 import { BinaryOperationID, binaryOperators } from '../../utils/binaryOperators';
+import { getFieldDisplayName } from '../../field';
 
 export enum CalculateFieldMode {
   ReduceRow = 'reduceRow',
@@ -182,7 +183,7 @@ function findFieldValuesWithNameOrConstant(frame: DataFrame, name: string): Vect
   }
 
   for (const f of frame.fields) {
-    if (f.name === name) {
+    if (name === getFieldDisplayName(f, frame)) {
       return f.values;
     }
   }