From ad9eb6d6326ca4824f2d49242a199d9f84edc3e2 Mon Sep 17 00:00:00 2001
From: Andrew Watkins <watts@influxdb.com>
Date: Tue, 28 Nov 2017 12:46:01 -0500
Subject: [PATCH] Update label to handle new field shapes
---
ui/src/shared/presenters/index.js | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/ui/src/shared/presenters/index.js b/ui/src/shared/presenters/index.js
index dd23a5e04c..d9984206a1 100644
--- a/ui/src/shared/presenters/index.js
+++ b/ui/src/shared/presenters/index.js
@@ -110,11 +110,9 @@ function getRolesForUser(roles, user) {
}
export const buildDefaultYLabel = queryConfig => {
- return queryConfig.rawText
- ? ''
- : `${queryConfig.measurement}.${_.get(
- queryConfig,
- ['fields', '0', 'field'],
- ''
- )}`
+ const {measurement, fields} = queryConfig
+ const fieldAlias = `${_.get(fields, ['0', 'alias'], '')}`
+ const field = `${_.get(fields, ['0', 'value'], '')}`
+
+ return `${measurement}.${fieldAlias || field}`
}