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
Ensure highlighted bars are included in brush drill filter (#80025)
Kevin Kelleher9e329ce6fea6
diff --git a/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts b/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.tsindex e540d949d1e..d3537e7c10c 100644--- a/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts+++ b/e2e/test/scenarios/dashboard/visualizer/drillthrough.cy.spec.ts@@ -230,12 +230,11 @@ describe("scenarios > dashboard > visualizer > drillthrough", () => {H.queryBuilderFiltersPanel().findByText(/Created At: Month is May 1/).should("exist");- H.assertQueryBuilderRowCount(9);+ H.assertQueryBuilderRowCount(10);H.queryBuilderMain().within(() => {cy.findByText("Count").should("exist"); // y-axiscy.findByText("Created At: Month").should("exist"); // x-axiscy.findByText("May 2026").should("exist");- cy.findByText("December 2026").should("exist");});});});diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.tsindex 2389d116b0b..b9722e3614e 100644--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.ts@@ -470,10 +470,15 @@ function clampTemporalBrushRange(const dateFormat = isDateWithoutTime(column)? "YYYY-MM-DD": "YYYY-MM-DDTHH:mm:ss";- const clampedStart = dayjs(start)- .add(1, unit)- .startOf(unit)- .format(dateFormat);+ const startDate = dayjs(start);+ const truncatedStart = startDate.startOf(unit);+ // Same as Lib.updateTemporalFilter: if start is already the first instant of+ // its unit (typical when it comes from a highlighted bar), keep it.+ const clampedStart = (+ startDate.isSame(truncatedStart)+ ? truncatedStart+ : startDate.add(1, unit).startOf(unit)+ ).format(dateFormat);const clampedEnd = dayjs(end).startOf(unit).format(dateFormat);if (dayjs(clampedStart).isAfter(dayjs(clampedEnd))) {return null;diff --git a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.ts b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.tsindex b28b73df98a..b2e08cb06d2 100644--- a/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.ts+++ b/frontend/src/metabase/explorations/components/ExplorationVisualization/utils.unit.spec.ts@@ -373,6 +373,38 @@ describe("getExploreFurtherFilters", () => {]);});+ it("keeps an aligned temporal brush start instead of rounding it up a unit", () => {+ const column = createMockDatetimeColumn({+ name: "CREATED_AT",+ source: "breakout",+ unit: "month",+ field_ref: ["field", 20, { "temporal-unit": "month" }],+ });+ // Start is exactly Jan 1, the January bar's tick, so the filter includes it+ // (same as Lib.updateTemporalFilter).+ const clicked: ClickObject = {+ brushRange: {+ type: "temporal",+ start: "2020-01-01T00:00:00",+ end: "2020-03-10T09:05:00",+ },+ column,+ event: new MouseEvent("click"),+ settings: {+ column: () => ({ column, date_abbreviate: true }),+ },+ };++ expect(getExploreFurtherFilters(clicked)).toEqual([+ {+ operator: "between",+ field_ref: ["field", 20, { "temporal-unit": "month" }],+ values: ["2020-01-01T00:00:00", "2020-03-01T00:00:00"],+ display_value: "Jan 2020 – Mar 2020",+ },+ ]);+ });+it("returns an equality filter when a temporal brush covers a single dot", () => {const column = createMockDatetimeColumn({name: "CREATED_AT",@@ -404,6 +436,36 @@ describe("getExploreFurtherFilters", () => {]);});+ it("returns an equality filter when an aligned temporal brush start and end collapse to one dot", () => {+ const column = createMockDatetimeColumn({+ name: "CREATED_AT",+ source: "breakout",+ unit: "month",+ field_ref: ["field", 20, { "temporal-unit": "month" }],+ });+ const clicked: ClickObject = {+ brushRange: {+ type: "temporal",+ start: "2020-02-01T00:00:00",+ end: "2020-02-20T09:05:00",+ },+ column,+ event: new MouseEvent("click"),+ settings: {+ column: () => ({ column, date_abbreviate: true }),+ },+ };++ expect(getExploreFurtherFilters(clicked)).toEqual([+ {+ operator: "=",+ field_ref: ["field", 20, { "temporal-unit": "month" }],+ value: "2020-02-01T00:00:00",+ display_value: "Feb 2020",+ },+ ]);+ });+it("returns no filters when a temporal brush covers no dots", () => {const column = createMockDatetimeColumn({name: "CREATED_AT",diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.tsindex dbc5b245001..9ebe91d3b7c 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts@@ -65,8 +65,6 @@ export const getSharedEChartsOptions = (brush: {toolbox: ["lineX" as const],xAxisIndex: 0,- throttleType: "debounce" as const,- throttleDelay: 200,brushStyle: {color: getBrushStyle(renderingContext).fill,borderWidth: 0,@@ -390,8 +388,6 @@ export function buildSplitPanelOverrides(brush: {toolbox: ["lineX" as const],xAxisIndex: Array.from({ length: panelCount }, (_, index) => index),- throttleType: "debounce" as const,- throttleDelay: 200,brushStyle: {color: "transparent",borderColor: "transparent",diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.unit.spec.tsindex 5abd612c62c..e98aed4db22 100644--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.unit.spec.ts+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.unit.spec.ts@@ -1,3 +1,11 @@+import { BarChart } from "echarts/charts";+import {+ BrushComponent,+ GridComponent,+ ToolboxComponent,+} from "echarts/components";+import * as echarts from "echarts/core";+import { SVGRenderer } from "echarts/renderers";import type { XAXisOption, YAXisOption } from "echarts/types/dist/shared";import type { RenderingContext } from "metabase/visualizations/types";@@ -16,7 +24,15 @@ import { getCartesianChartModel } from "../model";import { buildAxes } from "./axis";import { buildEChartsSeries } from "./series";-import { ensureRoomForLabels } from "./index";+import { ensureRoomForLabels, getSharedEChartsOptions } from "./index";++echarts.use([+ BarChart,+ GridComponent,+ BrushComponent,+ ToolboxComponent,+ SVGRenderer,+]);const chartWidth = 480;const chartHeight = 274;@@ -141,3 +157,55 @@ describe("ensureRoomForLabels", () => {expect(axes.yAxis.map(getBoundaryGap)).toEqual([[0.026, 0]]);});});++describe("brushSelected / brushEnd ordering", () => {+ it("does not throttle brushSelected in getSharedEChartsOptions", () => {+ const renderingContext: RenderingContext = {+ ...mockRenderingContext,+ getColor: () => "#509EE3",+ };+ const { brush } = getSharedEChartsOptions(false, renderingContext);++ expect(brush).not.toHaveProperty("throttleType");+ expect(brush).not.toHaveProperty("throttleDelay");+ });++ it("delivers brushSelected synchronously before brushEnd when throttle is unset", () => {+ const dom = document.createElement("div");+ document.body.appendChild(dom);+ const chart = echarts.init(dom, undefined, {+ renderer: "svg",+ width: 600,+ height: 400,+ });+ chart.setOption({+ animation: false,+ // Unthrottled, matching getSharedEChartsOptions. xAxisIndex is omitted+ // because jsdom never finishes cartesian layout.+ brush: { toolbox: ["lineX"] },+ xAxis: { type: "category", data: ["a", "b", "c", "d", "e"] },+ yAxis: { type: "value" },+ series: [{ type: "bar", data: [1, 2, 3, 4, 5] }],+ });++ const order: string[] = [];+ chart.on("brushSelected", () => {+ order.push("brushSelected");+ });+ chart.on("brushEnd", () => {+ order.push("brushEnd");+ });++ const area = {+ brushType: "lineX" as const,+ range: [100, 300],+ xAxisIndex: 0,+ panelId: "grid--\u0000_ec_\u00000",+ };+ chart.dispatchAction({ type: "brush", areas: [area] });+ chart.dispatchAction({ type: "brushEnd", areas: [area] });++ expect(order).toEqual(["brushSelected", "brushEnd"]);+ chart.dispose();+ });+});diff --git a/frontend/src/metabase/visualizations/echarts/types.ts b/frontend/src/metabase/visualizations/echarts/types.tsindex 7b438ecd315..ebe85448926 100644--- a/frontend/src/metabase/visualizations/echarts/types.ts+++ b/frontend/src/metabase/visualizations/echarts/types.ts@@ -28,14 +28,28 @@ export type EChartsSeriesBrushEvent = {export function isLineXBrushRange(range: BrushAreaParam["range"],-): range is number[] {- return Array.isArray(range) && typeof range[0] === "number";+): range is [number, number] {+ return (+ Array.isArray(range) &&+ range.length === 2 &&+ typeof range[0] === "number" &&+ typeof range[1] === "number"+ );}export type EChartsSeriesBrushEndEvent = EChartsSeriesMouseEvent & {areas: BrushAreaParam[];};+export type EChartsSeriesBrushSelectedEvent = {+ batch: {+ selected: {+ seriesIndex: number;+ dataIndex: number[];+ }[];+ }[];+};+export type EChartsCartesianCoordinateSystem = {x: number;y: number;diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.tsindex e38fdafd49b..a2f6c6f7489 100644--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts@@ -2,6 +2,7 @@ import { t } from "ttag";import _ from "underscore";import { isNative } from "metabase/common/utils/card";+import { dayjs } from "metabase/dayjs";import { NULL_DISPLAY_VALUE } from "metabase/utils/constants";import { formatChangeWithSign, formatPercent } from "metabase/utils/formatting";import { getObjectKeys } from "metabase/utils/objects";@@ -42,6 +43,7 @@ import type {import { getMarkerColorClass } from "metabase/visualizations/echarts/tooltip";import {type EChartsSeriesBrushEndEvent,+ type EChartsSeriesBrushSelectedEvent,type EChartsSeriesMouseEvent,isLineXBrushRange,} from "metabase/visualizations/echarts/types";@@ -325,6 +327,13 @@ export const canBrush = (return false;}+ // disable brushing for a binned dimension+ // binning plus "linear" scale is possible, so excluding "histogram" isn't sufficient+ // a binned bar "0-10" is centered on the axis value 0. so the brush filter would apply incorrect values+ if (dimensionColumn?.binning_info) {+ return false;+ }+if (onBrush) {return true;}@@ -948,6 +957,70 @@ export const getSeriesClickData = (};};+export const getAdjustedBrushEndEvent = (+ brushEndEvent: EChartsSeriesBrushEndEvent,+ brushSelectedEvent: EChartsSeriesBrushSelectedEvent | null,+ chartModel: BaseCartesianChartModel,+): EChartsSeriesBrushEndEvent | null => {+ const coordRange = brushEndEvent.areas[0]?.coordRange;+ if (!coordRange || !isLineXBrushRange(coordRange)) {+ return null;+ }+ const adjustedCoordRange = getAdjustedCoordRange(+ coordRange,+ brushSelectedEvent,+ chartModel,+ );+ return {+ ...brushEndEvent,+ areas: [+ {+ ...brushEndEvent.areas[0],+ coordRange: adjustedCoordRange,+ },+ ],+ };+};++const getAdjustedCoordRange = (+ coordRange: [number, number],+ brushSelectedEvent: EChartsSeriesBrushSelectedEvent | null,+ chartModel: BaseCartesianChartModel,+): [number, number] => {+ const { xAxisModel, transformedDataset } = chartModel;+ // only the time series brush drill "clamps" dates and needs this adjustment+ if (!isTimeSeriesAxis(xAxisModel) || !brushSelectedEvent) {+ return coordRange;+ }+ let minIndex: number | null = null;+ let maxIndex: number | null = null;+ for (const { dataIndex } of brushSelectedEvent.batch[0]?.selected ?? []) {+ for (const i of dataIndex) {+ if (minIndex === null || i < minIndex) {+ minIndex = i;+ }+ if (maxIndex === null || i > maxIndex) {+ maxIndex = i;+ }+ }+ }+ if (minIndex === null || maxIndex === null) {+ return coordRange;+ }++ const getRangeValue = (index: number, defaultValue: number): number => {+ const axisValue = transformedDataset[index]?.[X_AXIS_DATA_KEY];+ if (typeof axisValue === "string") {+ return dayjs.utc(axisValue).valueOf();+ }+ return defaultValue;+ };+ return [+ Math.min(coordRange[0], getRangeValue(minIndex, coordRange[0])),+ Math.max(coordRange[1], getRangeValue(maxIndex, coordRange[1])),+ ];+};+export const getBrushClickObject = (chartModel: BaseCartesianChartModel,event: EChartsSeriesBrushEndEvent,@@ -957,12 +1030,7 @@ export const getBrushClickObject = (const area = event.areas[0];const coordRange = area?.coordRange;const pixelRange = area?.range;- if (- !isLineXBrushRange(coordRange) ||- !isLineXBrushRange(pixelRange) ||- coordRange.length < 2 ||- pixelRange.length < 2- ) {+ if (!isLineXBrushRange(coordRange) || !isLineXBrushRange(pixelRange)) {return null;}diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.tsindex 69149af1184..7d35fa044cf 100644--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts@@ -15,6 +15,7 @@ import type {} from "metabase/visualizations/echarts/cartesian/model/types";import type {EChartsSeriesBrushEndEvent,+ EChartsSeriesBrushSelectedEvent,EChartsSeriesMouseEvent,} from "metabase/visualizations/echarts/types";import type { ComputedVisualizationSettings } from "metabase/visualizations/types";@@ -27,6 +28,7 @@ import {import {canBrush,+ getAdjustedBrushEndEvent,getBrushClickObject,getEventDimensions,getSeriesClickData,@@ -454,6 +456,18 @@ describe("canBrush", () => {effective_type: "type/Float",});+ const binnedQuantityColumn = createMockColumn({+ name: "QUANTITY",+ display_name: "Quantity: 10 bins",+ source: "breakout",+ base_type: "type/Integer",+ effective_type: "type/Integer",+ binning_info: {+ binning_strategy: "num-bins",+ bin_width: 10,+ },+ });+const baseSettings: ComputedVisualizationSettings = {"graph.x_axis.scale": "linear",};@@ -511,6 +525,22 @@ describe("canBrush", () => {canBrush(series, baseSettings, sumSubtotalColumn, undefined, onBrush),).toBe(true);});++ // Binned dimensions default to histogram scale (already unbrushable), but+ // users can switch to linear. Bars are centered on the bin start (0 for+ // "0-10"), so a brush would filter the wrong range+ it("returns false when the x-axis dimension is binned, even on a linear scale", () => {+ const series = [+ createMockSingleSeries(+ {},+ { data: { cols: [binnedQuantityColumn, sumSubtotalColumn] } },+ ),+ ];++ expect(+ canBrush(series, baseSettings, binnedQuantityColumn, onChangeCardAndRun),+ ).toBe(false);+ });});describe("getBrushClickObject", () => {@@ -616,6 +646,206 @@ describe("getBrushClickObject", () => {});});+describe("getAdjustedBrushEndEvent", () => {+ const jan = "2020-01-01T00:00:00Z";+ const feb = "2020-02-01T00:00:00Z";+ const mar = "2020-03-01T00:00:00Z";+ const apr = "2020-04-01T00:00:00Z";+ const janMs = Date.UTC(2020, 0, 1);+ const febMs = Date.UTC(2020, 1, 1);+ const marMs = Date.UTC(2020, 2, 1);+ const aprMs = Date.UTC(2020, 3, 1);++ const timeSeriesChartModel = createMockCartesianChartModel({+ dimensionModel: {+ column: createdAtColumn,+ columnIndex: 0,+ columnByCardId: { [CARD_ID]: createdAtColumn },+ },+ xAxisModel: {+ axisType: "time",+ toEChartsAxisValue: (value) => String(value),+ fromEChartsAxisValue: (value) => dayjs.utc(value),+ interval: { unit: "month", count: 1 },+ intervalsCount: 4,+ range: [dayjs.utc(jan), dayjs.utc(apr)],+ formatter: String,+ },+ transformedDataset: [jan, feb, mar, apr].map((value, index) => ({+ [X_AXIS_DATA_KEY]: value,+ [INDEX_KEY]: index,+ })),+ });++ const brushEndEvent = (coordRange: [number, number]) =>+ // getAdjustedBrushEndEvent only reads areas; mouse fields are unused+ ({+ areas: [+ {+ brushType: "lineX",+ coordRange,+ range: [40, 180],+ },+ ],+ }) as unknown as EChartsSeriesBrushEndEvent;++ const brushSelectedEvent = (+ dataIndex: number[],+ ): EChartsSeriesBrushSelectedEvent => ({+ batch: [{ selected: [{ seriesIndex: 0, dataIndex }] }],+ });++ // Mid-January to mid-March: the pixel range covers parts of the Jan and Mar+ // bars without reaching their tick values.+ const partialCoordRange: [number, number] = [+ Date.UTC(2020, 0, 15),+ Date.UTC(2020, 2, 15),+ ];++ it("widens the start to include a highlighted bar whose tick is left of coordRange", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ brushSelectedEvent([0, 1, 2]),+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual([+ janMs,+ partialCoordRange[1],+ ]);+ });++ it("widens the end to include a highlighted bar whose tick is right of coordRange", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ brushSelectedEvent([1, 2, 3]),+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual([+ partialCoordRange[0],+ aprMs,+ ]);+ });++ it("widens both bounds when highlighted bars sit outside the pixel range", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ brushSelectedEvent([0, 1, 2, 3]),+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual([janMs, aprMs]);+ });++ it("takes the min and max dataIndex across series", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ {+ batch: [+ {+ selected: [+ { seriesIndex: 0, dataIndex: [1, 2] },+ { seriesIndex: 1, dataIndex: [0, 3] },+ ],+ },+ ],+ },+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual([janMs, aprMs]);+ });++ it("returns the original coordRange when nothing is selected", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ brushSelectedEvent([]),+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual(partialCoordRange);+ });++ it("returns the original coordRange when brushSelected is missing", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ null,+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual(partialCoordRange);+ });++ it("returns the original coordRange for a numeric axis", () => {+ const chartModel = createMockCartesianChartModel({+ xAxisModel: {+ axisType: "value",+ toEChartsAxisValue: (value) =>+ typeof value === "number" ? value : null,+ fromEChartsAxisValue: (value) => value,+ extent: [0, 10],+ interval: 1,+ intervalsCount: 10,+ isPadded: false,+ formatter: String,+ },+ transformedDataset: [0, 1, 2, 3].map((value, index) => ({+ [X_AXIS_DATA_KEY]: value,+ [INDEX_KEY]: index,+ })),+ });++ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent([1.5, 2.5]),+ brushSelectedEvent([0, 1, 2, 3]),+ chartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual([1.5, 2.5]);+ });++ it("returns null when coordRange is not a lineX pair", () => {+ // Missing coordRange is the case under test; mouse fields are unused+ const event = {+ areas: [{ brushType: "lineX", range: [40, 180] }],+ } as unknown as EChartsSeriesBrushEndEvent;++ expect(+ getAdjustedBrushEndEvent(+ event,+ brushSelectedEvent([0]),+ timeSeriesChartModel,+ ),+ ).toBeNull();+ });++ it("keeps a bound when the selected index is out of range", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ brushSelectedEvent([0, 99]),+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual([+ janMs,+ partialCoordRange[1],+ ]);+ });++ it("does not shrink the range when selected ticks sit inside coordRange", () => {+ const adjusted = getAdjustedBrushEndEvent(+ brushEndEvent(partialCoordRange),+ brushSelectedEvent([1, 2]),+ timeSeriesChartModel,+ );++ expect(adjusted?.areas[0].coordRange).toEqual(partialCoordRange);+ expect(febMs).toBeGreaterThan(partialCoordRange[0]);+ expect(marMs).toBeLessThan(partialCoordRange[1]);+ });+});+describe("getTooltipModel", () => {// The shape produced by funnelToBarTransform and scalarsBarTransform:// each series is a separate card with a datapoint at only its own category.diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.tsindex da1e60254e8..f45006a5754 100644--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts@@ -19,6 +19,7 @@ import { useClickedStateTooltipSync } from "metabase/visualizations/echarts/toolimport {type EChartsSeriesBrushEndEvent,type EChartsSeriesBrushEvent,+ type EChartsSeriesBrushSelectedEvent,type EChartsSeriesMouseEvent,isLineXBrushRange,} from "metabase/visualizations/echarts/types";@@ -30,6 +31,7 @@ import type {import type { EChartsEventHandler } from "metabase/visualizations/types/echarts";import {canBrush,+ getAdjustedBrushEndEvent,getBrushClickObject,getBrushData,getGoalLineHoverData,@@ -140,6 +142,9 @@ export const useChartEvents = (const optionRef = useLatest(option);+ const brushSelectedEventRef = useRef<EChartsSeriesBrushSelectedEvent | null>(+ null,+ );const keepBrushForClickActionsRef = useRef(false);const eventHandlers: EChartsEventHandler[] = useMemo(@@ -213,9 +218,25 @@ export const useChartEvents = (}},},+ {+ eventName: "brushSelected",+ handler: (event: EChartsSeriesBrushSelectedEvent) => {+ brushSelectedEventRef.current = event;+ },+ },{eventName: "brushEnd",- handler: (event: EChartsSeriesBrushEndEvent) => {+ handler: (brushEndEvent: EChartsSeriesBrushEndEvent) => {+ const adjustedBrushEndEvent = getAdjustedBrushEndEvent(+ brushEndEvent,+ brushSelectedEventRef.current,+ chartModel,+ );+ brushSelectedEventRef.current = null;+ if (!adjustedBrushEndEvent) {+ return;+ }+let openedClickActions = false;if (onBrush) {@@ -223,7 +244,7 @@ export const useChartEvents = (if (chartElement) {const clickObject = getBrushClickObject(chartModel,- event,+ adjustedBrushEndEvent,chartElement,settings,);@@ -246,7 +267,7 @@ export const useChartEvents = (isVisualizerCard ? visualizerRawSeries : rawSeries,metadata,chartModel,- event,+ adjustedBrushEndEvent,);if (eventData) {onChangeCardAndRun?.(eventData);diff --git a/src/metabase/lib/filter/update.cljc b/src/metabase/lib/filter/update.cljcindex 95095b5bf68..68d766107ed 100644--- a/src/metabase/lib/filter/update.cljc+++ b/src/metabase/lib/filter/update.cljc@@ -202,7 +202,10 @@(let [;; clamp range to unit to ensure we select exactly what's represented by the dots/bars. E.g. if I draw my;; filter from `2024-01-02` to `2024-03-05` and the unit is `:month`, we should only show the months;; between those two values, i.e. only `2024-02` and `2024-03`.- start (u.time/truncate (u.time/add start unit 1) unit)+ start (let [truncated-start (u.time/truncate start unit)]+ (if (zero? (u.time/unit-diff :millisecond truncated-start start))+ truncated-start+ (u.time/truncate (u.time/add start unit 1) unit)))end (u.time/truncate end unit);; update the breakout unit if appropriate.breakout-unit (temporal-filter-find-best-breakout-unit unit start end (:effective-type temporal-column))diff --git a/test/metabase/lib/filter/update_test.cljc b/test/metabase/lib/filter/update_test.cljcindex d9d5caba95b..0da60c0fcd6 100644--- a/test/metabase/lib/filter/update_test.cljc+++ b/test/metabase/lib/filter/update_test.cljc@@ -250,7 +250,7 @@(lib/update-temporal-filter query(-> (meta/field-metadata table field)(lib/with-temporal-bucket :day))- "2024-01-01"+ "2024-01-02""2024-01-03"))))))))(deftest ^:parallel update-temporal-filter-existing-breakout-date-stop-drill-down@@ -274,7 +274,7 @@(lib/update-temporal-filter query(-> (meta/field-metadata :checkins :date)(lib/with-temporal-bucket :day))- "2024-01-01"+ "2024-01-02""2024-01-03"))))))(deftest ^:parallel update-temporal-filter-equals-test@@ -287,7 +287,7 @@(lib/update-temporal-filter query(-> (meta/field-metadata :checkins :date)(lib/with-temporal-bucket :day))- "2024-01-01"+ "2024-01-02""2024-01-02"))))))#?(:cljs