From 43ed85df83418d77579ca67d2b1b43ffba03d410 Mon Sep 17 00:00:00 2001
From: Jesse Devaney <22608765+JesseSDevaney@users.noreply.github.com>
Date: Fri, 28 Jun 2024 16:38:16 -0400
Subject: [PATCH] Fix pin maps unnecessarily filtering out null values (#44853)
* prevent pin maps from filtering out rows with null values
- since pin maps are just displaying where the data is by latitude and longitude, we do not need to filter the pin just because one of the rows is null.
- the metric column selection does not make sense for pins as they just represent that data through coordinates (no aggregations or values displayed), so we should not be filtering out any data just because it is null
* add unit test
---
.../visualizations/components/PinMap.jsx | 10 ++++--
.../components/PinMap.unit.spec.js | 36 ++++++++++++++++++-
2 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/frontend/src/metabase/visualizations/components/PinMap.jsx b/frontend/src/metabase/visualizations/components/PinMap.jsx
index bec0d65f424..496756109f2 100644
--- a/frontend/src/metabase/visualizations/components/PinMap.jsx
+++ b/frontend/src/metabase/visualizations/components/PinMap.jsx
@@ -132,9 +132,13 @@ export default class PinMap extends Component {
]);
// only use points with numeric coordinates & metric
- const validPoints = allPoints.map(
- ([lat, lng, metric]) => lat != null && lng != null && metric != null,
- );
+ const validPoints = allPoints.map(([lat, lng, metric]) => {
+ if (settings["map.type"] === "pin") {
+ return lat != null && lng != null;
+ }
+
+ return lat != null && lng != null && metric != null;
+ });
const points = allPoints.filter((_, i) => validPoints[i]);
const updatedRows = rows.filter((_, i) => validPoints[i]);
diff --git a/frontend/src/metabase/visualizations/components/PinMap.unit.spec.js b/frontend/src/metabase/visualizations/components/PinMap.unit.spec.js
index ed73b523b4e..3f9a2128d82 100644
--- a/frontend/src/metabase/visualizations/components/PinMap.unit.spec.js
+++ b/frontend/src/metabase/visualizations/components/PinMap.unit.spec.js
@@ -1,7 +1,7 @@
import PinMap from "metabase/visualizations/components/PinMap";
describe("PinMap", () => {
- it("should filter out rows with null values", () => {
+ it("should filter out rows with null values in either the lat, long, or metric column", () => {
const onUpdateWarnings = jest.fn();
const data = {
cols: ["lat", "lng", "metric"].map(name => ({ name })),
@@ -28,4 +28,38 @@ describe("PinMap", () => {
"We filtered out 3 row(s) containing null values.",
]);
});
+
+ it("should filter out rows only if the lat or long values are null for pin maps", () => {
+ const onUpdateWarnings = jest.fn();
+ const data = {
+ cols: ["lat", "lng", "metric"].map(name => ({ name })),
+ rows: [
+ [null, 0, 0],
+ [0, null, 0],
+ [0, 0, null],
+ [1, 2, null],
+ [0, 0, 0],
+ ],
+ };
+ const props = {
+ settings: {
+ "map.latitude_column": "lat",
+ "map.longitude_column": "lng",
+ "map.metric_column": "metric",
+ "map.type": "pin",
+ },
+ series: [{ data }],
+ onUpdateWarnings,
+ };
+ const { points } = new PinMap(props)._getPoints(props);
+
+ expect(points).toEqual([
+ [0, 0, null],
+ [1, 2, null],
+ [0, 0, 0],
+ ]);
+ expect(onUpdateWarnings.mock.calls[0][0]).toEqual([
+ "We filtered out 2 row(s) containing null values.",
+ ]);
+ });
});
--
GitLab