You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by vi...@apache.org on 2023/03/28 11:07:45 UTC
[superset] branch master updated: fix(legacy-plugin-chart-heatmap): fix adhoc column tooltip (#23507)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 0cebe8bf18 fix(legacy-plugin-chart-heatmap): fix adhoc column tooltip (#23507)
0cebe8bf18 is described below
commit 0cebe8bf18204d17f311345744e67c4bf5961083
Author: Ville Brofeldt <33...@users.noreply.github.com>
AuthorDate: Tue Mar 28 14:07:34 2023 +0300
fix(legacy-plugin-chart-heatmap): fix adhoc column tooltip (#23507)
---
.../plugins/legacy-plugin-chart-heatmap/src/Heatmap.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js
index f2e3624f05..b377c71c57 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js
@@ -22,6 +22,8 @@ import PropTypes from 'prop-types';
import 'd3-svg-legend';
import d3tip from 'd3-tip';
import {
+ getColumnLabel,
+ getMetricLabel,
getNumberFormatter,
NumberFormats,
getSequentialSchemeRegistry,
@@ -44,8 +46,8 @@ const propTypes = {
height: PropTypes.number,
bottomMargin: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
colorScheme: PropTypes.string,
- columnX: PropTypes.string,
- columnY: PropTypes.string,
+ columnX: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
+ columnY: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
leftMargin: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
metric: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
normalized: PropTypes.bool,
@@ -338,12 +340,13 @@ function Heatmap(element, props) {
const k = d3.mouse(this);
const m = Math.floor(scale[0].invert(k[0]));
const n = Math.floor(scale[1].invert(k[1]));
- const metricLabel = typeof metric === 'object' ? metric.label : metric;
if (m in matrix && n in matrix[m]) {
const obj = matrix[m][n];
- s += `<div><b>${columnX}: </b>${obj.x}<div>`;
- s += `<div><b>${columnY}: </b>${obj.y}<div>`;
- s += `<div><b>${metricLabel}: </b>${valueFormatter(obj.v)}<div>`;
+ s += `<div><b>${getColumnLabel(columnX)}: </b>${obj.x}<div>`;
+ s += `<div><b>${getColumnLabel(columnY)}: </b>${obj.y}<div>`;
+ s += `<div><b>${getMetricLabel(metric)}: </b>${valueFormatter(
+ obj.v,
+ )}<div>`;
if (showPercentage) {
s += `<div><b>%: </b>${fp(normalized ? obj.rank : obj.perc)}<div>`;
}