From commits-return-1074-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Tue Jun 12 02:14:08 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 4E6EA180647 for ; Tue, 12 Jun 2018 02:14:08 +0200 (CEST) Received: (qmail 26504 invoked by uid 500); 12 Jun 2018 00:14:07 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 26495 invoked by uid 99); 12 Jun 2018 00:14:07 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2018 00:14:07 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9DB3F82984; Tue, 12 Jun 2018 00:14:06 +0000 (UTC) Date: Tue, 12 Jun 2018 00:14:06 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] branch master updated: Fixing tooltip displaying metrics in heatmap (#5055) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152876244645.11235.12282078947748641035@gitbox.apache.org> From: ccwilliams@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3de79b69d0d9b4ab4fe9e9155467f730d1b19e5a X-Git-Newrev: 280200f8341757923aef1a1de9cf8b174c16cd66 X-Git-Rev: 280200f8341757923aef1a1de9cf8b174c16cd66 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ccwilliams 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 280200f Fixing tooltip displaying metrics in heatmap (#5055) 280200f is described below commit 280200f8341757923aef1a1de9cf8b174c16cd66 Author: michellethomas AuthorDate: Mon Jun 11 17:14:02 2018 -0700 Fixing tooltip displaying metrics in heatmap (#5055) --- superset/assets/src/visualizations/heatmap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/superset/assets/src/visualizations/heatmap.js b/superset/assets/src/visualizations/heatmap.js index 7d471d5..c26291f 100644 --- a/superset/assets/src/visualizations/heatmap.js +++ b/superset/assets/src/visualizations/heatmap.js @@ -177,11 +177,12 @@ function heatmapVis(slice, payload) { const k = d3.mouse(this); const m = Math.floor(scale[0].invert(k[0])); const n = Math.floor(scale[1].invert(k[1])); + const metric = typeof fd.metric === 'object' ? fd.metric.label : fd.metric; if (m in matrix && n in matrix[m]) { const obj = matrix[m][n]; s += '
' + fd.all_columns_x + ': ' + obj.x + '
'; s += '
' + fd.all_columns_y + ': ' + obj.y + '
'; - s += '
' + fd.metric + ': ' + valueFormatter(obj.v) + '
'; + s += '
' + metric + ': ' + valueFormatter(obj.v) + '
'; if (fd.show_perc) { s += '
%: ' + fp(fd.normalized ? obj.rank : obj.perc) + '
'; } -- To stop receiving notification emails like this one, please contact ccwilliams@apache.org.