From bd2cb9aada1d367ed8883cf6ab4ef33034e6f5b2 Mon Sep 17 00:00:00 2001
From: EvelynTurner <36863942+EvelynTurner@users.noreply.github.com>
Date: Fri, 6 Apr 2018 19:22:20 -0400
Subject: [PATCH] [Bug fix] Resolving key conflicts in Timeseries Annotation
 Layer when key is a string (#4768)

* Fix how the annotation layer interpretes the timestamp string without timezone info; use it as UTC

* [Bug fix] Fixed/Refactored annotation layer code so that non-timeseries annotations are applied based on the updated chart object after adding all data

* [Bug fix] Fixed/Refactored annotation layer code so that non-timeseries annotations are applied based on the updated chart object after adding all data

* Fixed indentation

* Fix the key string value in case series.key is a string

* Fix the key string value in case series.key is a string
---
 superset/assets/visualizations/nvd3_vis.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/assets/visualizations/nvd3_vis.js b/superset/assets/visualizations/nvd3_vis.js
index c5b2433b8..fb439ec72 100644
--- a/superset/assets/visualizations/nvd3_vis.js
+++ b/superset/assets/visualizations/nvd3_vis.js
@@ -543,7 +543,7 @@ function nvd3Vis(slice, payload) {
             return {};
           }
           const key = Array.isArray(series.key) ?
-            `${a.name}, ${series.key.join(', ')}` : a.name;
+            `${a.name}, ${series.key.join(', ')}` : `${a.name}, ${series.key}`;
           return {
             ...series,
             key,