superset-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maximebeauche...@apache.org
Subject [incubator-superset] branch master updated: [Bug fix] Resolving key conflicts in Timeseries Annotation Layer when key is a string (#4768)
Date Fri, 06 Apr 2018 23:22:22 GMT
This is an automated email from the ASF dual-hosted git repository.

maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new bd2cb9a  [Bug fix] Resolving key conflicts in Timeseries Annotation Layer when key
is a string (#4768)
bd2cb9a is described below

commit bd2cb9aada1d367ed8883cf6ab4ef33034e6f5b2
Author: EvelynTurner <36863942+EvelynTurner@users.noreply.github.com>
AuthorDate: Fri Apr 6 19:22:20 2018 -0400

    [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 c5b2433..fb439ec 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,

-- 
To stop receiving notification emails like this one, please contact
maximebeauchemin@apache.org.

Mime
View raw message