-
- {o.object.cat_color && (
-
- )}
- {o.object.metric && (
+function setTooltipContent(formData, verboseMap) {
+ return o => {
+ const label =
+ verboseMap?.[formData.point_radius_fixed.value] ||
+ getMetricLabel(formData.point_radius_fixed?.value);
+ return (
+
- )}
-
- );
+ {o.object.cat_color && (
+
+ )}
+ {o.object.metric &&
}
+
+ );
+ };
}
-export function getLayer(formData, payload, onAddFilter, setTooltip) {
+export function getLayer(formData, payload, onAddFilter, setTooltip, datasource) {
const fd = formData;
const dataWithRadius = payload.data.features.map(d => {
let radius = unitToRadius(fd.point_unit, d.radius) || 10;
@@ -73,7 +73,7 @@ export function getLayer(formData, payload, onAddFilter, setTooltip) {
radiusMinPixels: fd.min_radius || null,
radiusMaxPixels: fd.max_radius || null,
stroked: false,
- ...commonLayerProps(fd, setTooltip, setTooltipContent(fd)),
+ ...commonLayerProps(fd, setTooltip, setTooltipContent(fd, datasource?.verboseMap)),
});
}
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js
index 457255ad26..4fad98b127 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js
@@ -66,8 +66,8 @@ export default {
{
label: t('Point Size'),
controlSetRows: [
+ [pointRadiusFixed],
[
- pointRadiusFixed,
{
name: 'point_unit',
config: {
@@ -125,17 +125,17 @@ export default {
{
label: t('Point Color'),
controlSetRows: [
- ['color_picker', legendPosition],
- [null, legendFormat],
+ ['color_picker'],
+ [legendPosition],
+ [legendFormat],
[
{
...dimension,
label: t('Categorical Color'),
description: t('Pick a dimension from which categorical colors are defined'),
},
- 'color_scheme',
- 'label_colors',
],
+ ['color_scheme'],
],
},
{
diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/transformProps.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/transformProps.js
index 643b936b12..a05128c023 100644
--- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/transformProps.js
+++ b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/transformProps.js
@@ -19,10 +19,11 @@
const NOOP = () => {};
export default function transformProps(chartProps) {
- const { width, height, rawFormData, queriesData, hooks } = chartProps;
+ const { datasource, height, hooks, queriesData, rawFormData, width } = chartProps;
const { onAddFilter = NOOP, setControlValue = NOOP } = hooks;
return {
+ datasource,
formData: rawFormData,
height,
onAddFilter,