The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Handle null x-axis values in time series charts (#75962)
Kevin Kelleher449527b9faa1
diff --git a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Visualizer_Timeseries_Different_Units.png b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Visualizer_Timeseries_Different_Units.pngindex 267d9647025..46c5e953708 100644Binary files a/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Visualizer_Timeseries_Different_Units.png and b/.loki/reference/chrome_laptop_Viz_Static_Viz_ComboChart_Visualizer_Timeseries_Different_Units.png differdiff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.tsindex ffa3a763cd0..d5559707b93 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.ts@@ -862,7 +862,15 @@ export const sortDataset = (if (leftDate == null || rightDate == null) {showWarning?.(invalidDateWarning(leftDate == null ? left : right).text);- return 0;+ if (leftDate == null && rightDate == null) {+ return 0;+ }+ if (leftDate == null) {+ return 1; // sort nulls to end+ }+ if (rightDate == null) {+ return -1;+ }}return leftDate.valueOf() - rightDate.valueOf();diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.tsindex af6cc32a2e8..c0bcabe9002 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/model/dataset.unit.spec.ts@@ -919,6 +919,24 @@ describe("dataset transform functions", () => {expect(result[2][X_AXIS_DATA_KEY]).toBe("2022-03-01");});+ it("should sort valid dates and move null dates to the end", () => {+ const dataset = [+ { [X_AXIS_DATA_KEY]: "2022-03-01", [seriesKey]: 10 },+ { [X_AXIS_DATA_KEY]: null, [seriesKey]: 2 },+ { [X_AXIS_DATA_KEY]: "2022-01-01", [seriesKey]: 5 },+ { [X_AXIS_DATA_KEY]: "2022-02-01", [seriesKey]: 8 },+ ];++ const result = sortDataset(dataset, "timeseries");++ expect(result.map((datum) => datum[X_AXIS_DATA_KEY])).toEqual([+ "2022-01-01",+ "2022-02-01",+ "2022-03-01",+ null,+ ]);+ });+it.each(numericScale)("should sort numeric datasets", (xAxisScale) => {const dataset = [{ [X_AXIS_DATA_KEY]: 1000, [seriesKey]: 10 },