From 7647865e082d343926cecf59ceebd46c15081f92 Mon Sep 17 00:00:00 2001
From: Fabian <fmenges@twitter.com>
Date: Mon, 2 Oct 2017 14:35:38 -0400
Subject: [PATCH] Fixing label generation for grouped by single metric
 timeseries charts

---
 superset/assets/visualizations/nvd3_vis.js | 34 ++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/superset/assets/visualizations/nvd3_vis.js b/superset/assets/visualizations/nvd3_vis.js
index fd147eecaede..66d11b2d2140 100644
--- a/superset/assets/visualizations/nvd3_vis.js
+++ b/superset/assets/visualizations/nvd3_vis.js
@@ -75,19 +75,22 @@ function getMaxLabelSize(container, axisClass) {
 }
 
 /* eslint-disable camelcase */
-function formatLabel(column, verbose_map) {
+function formatLabel(column, verbose_map, removeMostSignificant) {
   let label;
-  if (verbose_map) {
-    if (Array.isArray(column) && column.length) {
-      label = verbose_map[column[0]];
+  if (Array.isArray(column) && column.length) {
+    if (removeMostSignificant && column.length > 1) {
+      label = '';
+    } else {
+      label = verbose_map[column[0]] || column[0];
       if (column.length > 1) {
-        label += `, ${column.slice(1).join(', ')}`;
+        label += ', ';
       }
-    } else {
-      label = verbose_map[column];
     }
+    label += column.slice(1).join(', ');
+  } else {
+    label = verbose_map[column] || column;
   }
-  return label || column;
+  return label;
 }
 /* eslint-enable camelcase */
 
@@ -97,9 +100,22 @@ function nvd3Vis(slice, payload) {
   const isExplore = $('#explore-container').length === 1;
 
   let data;
+  // Get the most significant part of the series name (key)
+  const mostSignificant = payload.data
+    .filter(x => Array.isArray(x.key) && x.key.length > 1)
+    .map(x => x.key[0]);
+  // # of distinct most significant keys
+  const distinctMostSignificant = mostSignificant
+    .reduce((distinct, v) => distinct.add(v), new Set()).size;
+  // remove the msg key from the label if these conditions are true
+  const removeMostSignificant = mostSignificant.length === payload.data.length &&
+    distinctMostSignificant === 1;
   if (payload.data) {
     data = payload.data.map(x => ({
-      ...x, key: formatLabel(x.key, slice.datasource.verbose_map),
+      ...x,
+      key: formatLabel(x.key,
+        slice.datasource.verbose_map || {},
+        removeMostSignificant),
     }));
   } else {
     data = [];