From e6129eb49290234bdac48837c18b73c5132c125b Mon Sep 17 00:00:00 2001 From: michellethomas Date: Tue, 7 Nov 2017 13:34:31 -0800 Subject: [PATCH] Adding back iso and correctly filtering iso from contrib total (#3793) --- superset/assets/visualizations/time_table.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/superset/assets/visualizations/time_table.jsx b/superset/assets/visualizations/time_table.jsx index 553310892e..42e929e331 100644 --- a/superset/assets/visualizations/time_table.jsx +++ b/superset/assets/visualizations/time_table.jsx @@ -38,7 +38,7 @@ function viz(slice, payload) { slice.container.css('height', slice.height()); const records = payload.data.records; const fd = payload.form_data; - const data = Object.keys(records).sort().map(iso => ({ ...records[iso] })); + const data = Object.keys(records).sort().map(iso => ({ ...records[iso], iso })); const reversedData = [...data].reverse(); const metricMap = {}; slice.datasource.metrics.forEach((m) => { @@ -140,7 +140,7 @@ function viz(slice, payload) { } else if (c.colType === 'contrib') { // contribution to column total v = recent / Object.keys(reversedData[0]) - .map(k => reversedData[0][k]) + .map(k => k !== 'iso' ? reversedData[0][k] : null) .reduce((a, b) => a + b); } else if (c.colType === 'avg') { // Average over the last {timeLag}