Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix x axis range calculation when undefined values are present (#65125)

Marcos80ac5931a018
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
index cc460ba032e..185f5a8eb1c 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.ts
@@ -881,31 +881,36 @@ export function getXAxisModel(
};
}
-const getXAxisDateRangeFromSortedXAxisValues = (
+export const getXAxisDateRangeFromSortedXAxisValues = (
xValues: RowValue[],
): DateRange | undefined => {
- if (xValues.length === 0) {
+ const filteredXValues = xValues.filter((x) => x !== undefined);
+
+ if (filteredXValues.length === 0) {
return undefined;
}
// Find the first non-null date from the start
let minDateIndex = 0;
while (
- minDateIndex < xValues.length &&
- tryGetDate(xValues[minDateIndex]) === null
+ minDateIndex < filteredXValues.length &&
+ tryGetDate(filteredXValues[minDateIndex]) === null
) {
minDateIndex++;
}
// Find the first non-null date from the end
- let maxDateIndex = xValues.length - 1;
- while (maxDateIndex >= 0 && tryGetDate(xValues[maxDateIndex]) === null) {
+ let maxDateIndex = filteredXValues.length - 1;
+ while (
+ maxDateIndex >= 0 &&
+ tryGetDate(filteredXValues[maxDateIndex]) === null
+ ) {
maxDateIndex--;
}
// Assume the dataset is sorted
- const minDate = tryGetDate(xValues[minDateIndex]);
- const maxDate = tryGetDate(xValues[maxDateIndex]);
+ const minDate = tryGetDate(filteredXValues[minDateIndex]);
+ const maxDate = tryGetDate(filteredXValues[maxDateIndex]);
if (minDate == null || maxDate == null) {
return undefined;
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts
index 434d25690c4..757d222d634 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/axis.unit.spec.ts
@@ -1,4 +1,8 @@
-import { computeSplit } from "./axis";
+import dayjs from "dayjs";
+
+import type { RowValue } from "metabase-types/api";
+
+import { computeSplit, getXAxisDateRangeFromSortedXAxisValues } from "./axis";
import type { SeriesExtents } from "./types";
describe("computeSplit", () => {
@@ -23,3 +27,18 @@ describe("computeSplit", () => {
);
});
});
+
+describe("getXAxisDateRangeFromSortedXAxisValues", () => {
+ it("should not consider undefined values for the range", () => {
+ // Undefined values appear when two timeseries datasets are combined (#64921)
+ const range = getXAxisDateRangeFromSortedXAxisValues([
+ "2022-03-01T00:00:00Z",
+ "2022-04-01T00:00:00Z",
+ undefined,
+ ] as RowValue[]);
+ expect(range).toStrictEqual([
+ dayjs.utc("2022-03-01T00:00:00Z"),
+ dayjs.utc("2022-04-01T00:00:00Z"),
+ ]);
+ });
+});