Skip to content

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

UXW-4481 Timeline Events new UI (#76381)

Denis Berezin82b65c849658
diff --git a/e2e/support/helpers/e2e-visual-tests-helpers.js b/e2e/support/helpers/e2e-visual-tests-helpers.js
index aea8da64081..4168d978689 100644
--- a/e2e/support/helpers/e2e-visual-tests-helpers.js
+++ b/e2e/support/helpers/e2e-visual-tests-helpers.js
@@ -1,12 +1,7 @@
import { popover } from "e2e/support/helpers/e2e-ui-elements-helpers";
import { color as getColor } from "metabase/ui/colors";
-import { Icons } from "metabase/ui/components/icons/Icon/icons";
import { GOAL_LINE_DASH } from "metabase/visualizations/echarts/cartesian/option/goal-line.ts";
import { TREND_LINE_DASH } from "metabase/visualizations/echarts/cartesian/option/trend-line.ts";
-import {
- setSvgColor,
- svgToDataUri,
-} from "metabase/visualizations/echarts/cartesian/timeline-events/option";
import { isFixedPositionElementVisible } from "./e2e-element-visibility-helpers";
@@ -57,14 +52,8 @@ export function getXYTransform(element) {
return { x, y };
}
-export function echartsIcon(name, isSelected = false) {
- const iconSvg = setSvgColor(
- Icons[name].source,
- getColor(isSelected ? "brand" : "text-disabled"),
- );
- const dataUri = svgToDataUri(iconSvg);
-
- return echartsContainer().find(`image[href="${dataUri}"]`);
+export function timelineEventChip(label) {
+ return cy.get(`[data-testid="timeline-event-chip"][aria-label="${label}"]`);
}
export function chartGridLines() {
diff --git a/e2e/test/scenarios/organization/timelines-question.cy.spec.js b/e2e/test/scenarios/organization/timelines-question.cy.spec.js
index 1acc91c0240..c52b31d123e 100644
--- a/e2e/test/scenarios/organization/timelines-question.cy.spec.js
+++ b/e2e/test/scenarios/organization/timelines-question.cy.spec.js
@@ -233,7 +233,7 @@ describe("scenarios > organization > timelines > question", () => {
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("Visualization").should("be.visible");
- H.echartsIcon("star").should("be.visible");
+ H.timelineEventChip("RC1").should("be.visible");
});
it("should not show events for non-timeseries questions", () => {
@@ -263,7 +263,7 @@ describe("scenarios > organization > timelines > question", () => {
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("Visualization").should("be.visible");
- H.echartsIcon("star").should("not.exist");
+ H.timelineEventChip("RC1").should("not.exist");
});
it("should show events for native queries", () => {
@@ -300,7 +300,7 @@ describe("scenarios > organization > timelines > question", () => {
cy.findByText("Visualization").should("be.visible");
cy.wait("@getTimelines");
- H.echartsIcon("star").should("be.visible");
+ H.timelineEventChip("RC1").should("be.visible");
});
it("should toggle individual event visibility", () => {
@@ -330,19 +330,19 @@ describe("scenarios > organization > timelines > question", () => {
cy.findByTestId("view-footer")
.findByText("Visualization")
.should("be.visible");
- H.echartsIcon("cloud").should("be.visible");
+ H.timelineEventChip("RC1").should("be.visible");
// should hide individual events from chart if hidden in sidebar
cy.icon("calendar").click();
cy.findByTestId("sidebar-content").findByText("Releases").click();
toggleEventVisibility("RC1");
- H.echartsIcon("cloud").should("not.exist");
+ H.timelineEventChip("RC1").should("not.exist");
// should show individual events in chart again
toggleEventVisibility("RC1");
- H.echartsIcon("cloud").should("be.visible");
+ H.timelineEventChip("RC1").should("be.visible");
// should show a newly created event
cy.button("Create event").click();
@@ -352,14 +352,14 @@ describe("scenarios > organization > timelines > question", () => {
waitForTimelinesAfterCreatingAnEvent("RC2");
H.undoToast().icon("close").click();
- H.echartsIcon("star").should("be.visible");
+ H.timelineEventChip("RC2").should("be.visible");
// should then hide the newly created event
timelineEventVisibility("RC2").should("be.checked");
toggleEventVisibility("RC2");
timelineEventVisibility("RC2").should("not.be.checked");
- H.echartsIcon("star").should("not.exist");
+ H.timelineEventChip("RC2").should("not.exist");
// its timeline, visible but having one hidden event
// should display its checkbox with a "dash" icon
@@ -375,8 +375,8 @@ describe("scenarios > organization > timelines > question", () => {
});
// once timeline is visible, all its events should be visible
- H.echartsIcon("star").should("be.visible");
- H.echartsIcon("cloud").should("be.visible");
+ H.timelineEventChip("RC2").should("be.visible");
+ H.timelineEventChip("RC1").should("be.visible");
// should initialize events in a hidden timelime
// with event checkboxes unchecked
@@ -398,13 +398,13 @@ describe("scenarios > organization > timelines > question", () => {
.closest("[aria-label='Timeline card header']")
.within(() => cy.findByRole("checkbox").click());
- H.echartsIcon("warning").should("be.visible");
+ H.timelineEventChip("TC1").should("be.visible");
// events whose timeline was invisible on page load
// should be hideable once their timelines are visible
toggleEventVisibility("TC1");
- H.echartsIcon("warning").should("not.exist");
+ H.timelineEventChip("TC1").should("not.exist");
/**
* This tests the case where group by unit with the event in the end range bucket
@@ -433,11 +433,11 @@ describe("scenarios > organization > timelines > question", () => {
toggleEventVisibility("RC2").should("not.be.checked");
cy.log("the new event should be visible in the chart");
- H.echartsIcon("star").should("be.visible");
+ H.timelineEventChip("Event at the end of range").should("be.visible");
});
});
- it("should color the event icon when hovering", () => {
+ it("should show a single-event popover on hover without a 'See all' link", () => {
H.createTimelineWithEvents({
timeline: { name: "Releases" },
events: [
@@ -447,12 +447,18 @@ describe("scenarios > organization > timelines > question", () => {
H.visitQuestion(ORDERS_BY_YEAR_QUESTION_ID);
- H.echartsIcon("star").should("be.visible");
- H.echartsIcon("star").realHover();
- H.echartsIcon("star", true).should("be.visible");
+ H.timelineEventChip("RC1").should("be.visible").realHover();
+
+ cy.log(
+ "hovering a single event shows a compact popover with no 'See all'",
+ );
+ cy.findByTestId("timeline-event-popover").within(() => {
+ cy.findByText("RC1").should("be.visible");
+ cy.findByText("See all").should("not.exist");
+ });
});
- it("should display the event tooltip when hovering on a stacked chart #74005", () => {
+ it("should show the event popover when hovering on a stacked chart #74005", () => {
H.createTimelineWithEvents({
timeline: { name: "Releases" },
events: [
@@ -478,42 +484,138 @@ describe("scenarios > organization > timelines > question", () => {
},
});
- H.echartsIcon("star").should("be.visible");
- H.echartsIcon("star").realHover();
- cy.findByTestId("timeline-event-tooltip").within(() => {
- cy.findByText("RC1").should("be.visible");
- });
+ H.timelineEventChip("RC1").should("be.visible").realHover();
+ cy.findByTestId("timeline-event-popover")
+ .findByText("RC1")
+ .should("be.visible");
});
- it("should open the sidebar when clicking an event icon", () => {
+ it("should collapse close events into a count chip and focus the sidebar on the group from 'See all'", () => {
H.createTimelineWithEvents({
timeline: { name: "Releases" },
events: [
- { name: "RC1", timestamp: "2027-10-20T00:00:00Z", icon: "star" },
+ { name: "Alpha", timestamp: "2027-10-03T00:00:00Z" },
+ { name: "Beta", timestamp: "2027-10-10T00:00:00Z" },
+ { name: "Gamma", timestamp: "2027-10-17T00:00:00Z" },
+ { name: "Delta", timestamp: "2027-10-24T00:00:00Z" },
],
});
+ // a second timeline that must be filtered out while the cluster is focused
+ H.createTimelineWithEvents({
+ timeline: { name: "Other" },
+ events: [{ name: "Outsider", timestamp: "2028-01-15T00:00:00Z" }],
+ });
- H.visitQuestion(ORDERS_BY_YEAR_QUESTION_ID);
+ H.visitQuestionAdhoc({
+ dataset_query: {
+ type: "query",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ breakout: [
+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "month" }],
+ ],
+ },
+ database: SAMPLE_DB_ID,
+ },
+ display: "line",
+ });
- H.echartsIcon("star").should("be.visible");
- H.echartsIcon("star").click();
+ cy.findByTestId("visualization-root").findByTestId(
+ "timeline-events-band",
+ );
- // event should be selected in sidebar
- timelineEventCard("RC1").should("be.visible");
- timelineEventCard("RC1").should(
- "have.css",
- "border-left",
- "4px solid rgb(80, 158, 226)",
+ cy.log(
+ "the four same-month events collapse into one chip with the count",
);
+ H.timelineEventChip("4 events").should("be.visible").and("contain", "4");
+
+ cy.log("hovering shows the first three events and a 'See all' link");
+ H.timelineEventChip("4 events").realHover();
+ cy.findByTestId("timeline-event-popover").within(() => {
+ cy.findByText("Alpha").should("be.visible");
+ cy.findByText("Gamma").should("be.visible");
+ cy.findByText("Delta").should("not.exist");
+ cy.findByText("See all").click();
+ });
- // after clicking the icon again, it should be deselected in sidebar
- H.echartsIcon("star", true).click();
- timelineEventCard("RC1").should("be.visible");
- timelineEventCard("RC1").should(
- "have.css",
- "border-left",
- "4px solid rgba(0, 0, 0, 0)",
+ cy.log("'See all' selects the cluster and focuses the sidebar on it");
+ H.timelineEventChip("4 events").should(
+ "have.attr",
+ "data-selected",
+ "true",
);
+ cy.findByTestId("sidebar-content").within(() => {
+ timelineEventCard("Alpha").should("be.visible");
+ timelineEventCard("Delta").should("be.visible");
+ });
+
+ cy.log("the unrelated timeline is filtered out of the focused list");
+ cy.findByTestId("sidebar-content")
+ .findByText("Other")
+ .should("not.exist");
+
+ cy.log("'All events' restores the full list of timelines");
+ cy.findByTestId("timeline-sidebar-show-all").click();
+ cy.findByTestId("sidebar-content")
+ .findByText("Other")
+ .should("be.visible");
+ });
+
+ it("should focus the sidebar on the group when a grouped chip is clicked directly", () => {
+ H.createTimelineWithEvents({
+ timeline: { name: "Releases" },
+ events: [
+ { name: "Alpha", timestamp: "2027-10-03T00:00:00Z" },
+ { name: "Beta", timestamp: "2027-10-10T00:00:00Z" },
+ ],
+ });
+ H.createTimelineWithEvents({
+ timeline: { name: "Other" },
+ events: [{ name: "Outsider", timestamp: "2028-01-15T00:00:00Z" }],
+ });
+
+ H.visitQuestionAdhoc({
+ dataset_query: {
+ type: "query",
+ query: {
+ "source-table": ORDERS_ID,
+ aggregation: [["count"]],
+ breakout: [
+ ["field", ORDERS.CREATED_AT, { "temporal-unit": "month" }],
+ ],
+ },
+ database: SAMPLE_DB_ID,
+ },
+ display: "line",
+ });
+
+ cy.log("clicking a grouped chip focuses the sidebar on its events");
+ H.timelineEventChip("2 events").should("be.visible").click();
+
+ cy.findByTestId("sidebar-content").within(() => {
+ timelineEventCard("Alpha").should("be.visible");
+ timelineEventCard("Beta").should("be.visible");
+ });
+ cy.findByTestId("sidebar-content")
+ .findByText("Other")
+ .should("not.exist");
+ });
+
+ it("should select a single event and open the full sidebar when its chip is clicked", () => {
+ H.createTimelineWithEvents({
+ timeline: { name: "Releases" },
+ events: [{ name: "RC1", timestamp: "2027-01-01T00:00:00Z" }],
+ });
+
+ H.visitQuestion(ORDERS_BY_YEAR_QUESTION_ID);
+
+ H.timelineEventChip("RC1").should("be.visible").click();
+
+ cy.log("the sidebar opens (unfiltered) with the event selected");
+ H.timelineEventChip("RC1").should("have.attr", "data-selected", "true");
+ cy.findByTestId("sidebar-content").findByText("RC1").should("be.visible");
+ cy.findByTestId("timeline-sidebar-show-all").should("not.exist");
});
// TODO @nemanjaglumac 2026-04-17: Simplify or potentially remove this repro altogether!
diff --git a/frontend/src/metabase-types/api/icon.ts b/frontend/src/metabase-types/api/icon.ts
index 9520552a54a..5e5024f625a 100644
--- a/frontend/src/metabase-types/api/icon.ts
+++ b/frontend/src/metabase-types/api/icon.ts
@@ -29,6 +29,7 @@ export type IconName =
| "ban"
| "bar"
| "bell"
+ | "bell_12"
| "birthday"
| "book_open"
| "bookmark"
@@ -57,6 +58,7 @@ export type IconName =
| "clone"
| "close"
| "cloud"
+ | "cloud_12"
| "cloud_filled"
| "collection2"
| "compare"
@@ -89,6 +91,7 @@ export type IconName =
| "embed_static"
| "empty"
| "enter_or_return"
+ | "event"
| "exit"
| "expand"
| "expand_arrow"
@@ -159,6 +162,7 @@ export type IconName =
| "lock"
| "lock_filled"
| "mail"
+ | "mail_at"
| "mail_filled"
| "mcp"
| "medallion"
@@ -174,6 +178,8 @@ export type IconName =
| "move_card"
| "network"
| "new_folder"
+ | "note"
+ | "note_12"
| "notebook"
| "number"
| "octagon_alert"
diff --git a/frontend/src/metabase-types/api/timeline.ts b/frontend/src/metabase-types/api/timeline.ts
index 4930ea956d6..13ed27e4031 100644
--- a/frontend/src/metabase-types/api/timeline.ts
+++ b/frontend/src/metabase-types/api/timeline.ts
@@ -11,9 +11,13 @@ export type TimelineEventId = number;
export type TimelineEventSource = "question" | "collections" | "api";
export type TimelineIcon =
+ | "info"
+ | "note"
+ | "event"
| "star"
| "cake"
| "mail"
+ | "mail_at"
| "warning"
| "bell"
| "cloud";
diff --git a/frontend/src/metabase/common/utils/timelines.ts b/frontend/src/metabase/common/utils/timelines.ts
index dbd18b0132e..f6fa6ec17ca 100644
--- a/frontend/src/metabase/common/utils/timelines.ts
+++ b/frontend/src/metabase/common/utils/timelines.ts
@@ -22,9 +22,12 @@ export const getTimelineIcons = (): {
}[] => {
return (
[
+ { label: t`Info`, value: "info" },
+ { label: t`Note`, value: "note" },
+ { label: t`Event`, value: "event" },
{ label: t`Star`, value: "star" },
{ label: t`Cake`, value: "cake" },
- { label: t`Mail`, value: "mail" },
+ { label: t`Mail`, value: "mail_at" },
{ label: t`Warning`, value: "warning" },
{ label: t`Bell`, value: "bell" },
{ label: t`Cloud`, value: "cloud" },
diff --git a/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.module.css b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.module.css
new file mode 100644
index 00000000000..f6fae743086
--- /dev/null
+++ b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.module.css
@@ -0,0 +1,9 @@
+.root {
+ &:not(:last-child) {
+ margin-bottom: 1.5rem;
+ }
+}
+
+.header {
+ cursor: pointer;
+}
diff --git a/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.styled.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.styled.tsx
deleted file mode 100644
index c54e994a182..00000000000
--- a/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.styled.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import styled from "@emotion/styled";
-
-import { Icon } from "metabase/ui";
-
-export const CardRoot = styled.div`
- &:not(:last-child) {
- margin-bottom: 1.5rem;
- }
-`;
-
-export const CardHeader = styled.div`
- display: flex;
- align-items: center;
- cursor: pointer;
-`;
-
-export const CardLabel = styled.span`
- flex: 1 1 auto;
- margin: 0 0.5rem;
- color: var(--mb-color-text-primary);
- font-weight: bold;
- font-size: 0.875rem;
- min-width: 0;
-`;
-
-export const CardIcon = styled(Icon)`
- color: var(--mb-color-text-secondary);
- width: 1.125rem;
- height: 1.125rem;
-`;
-
-export const CardContent = styled.div`
- margin: 1rem -1.5rem 1rem -1.5rem;
-`;
diff --git a/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.tsx
index 91c0dae86b1..8ac18783945 100644
--- a/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.tsx
+++ b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.tsx
@@ -1,21 +1,15 @@
import type { ChangeEvent, MouseEvent } from "react";
-import { memo, useCallback, useEffect, useMemo, useState } from "react";
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
import { getTimelineName } from "metabase/common/utils/timelines";
-import { Checkbox, Ellipsified } from "metabase/ui";
+import { Box, Checkbox, Ellipsified, Flex, Icon } from "metabase/ui";
import type { Timeline, TimelineEvent } from "metabase-types/api";
import EventCard from "../EventCard";
-import {
- CardContent,
- CardHeader,
- CardIcon,
- CardLabel,
- CardRoot,
-} from "./TimelineCard.styled";
+import S from "./TimelineCard.module.css";
export interface TimelineCardProps {
timeline: Timeline;
@@ -30,7 +24,7 @@ export interface TimelineCardProps {
onHideTimelineEvents: (timelineEvent: TimelineEvent[]) => void;
}
-const TimelineCard = ({
+const TimelineCardInner = ({
timeline,
isDefault,
visibleEventIds = [],
@@ -44,7 +38,11 @@ const TimelineCard = ({
}: TimelineCardProps): JSX.Element => {
const events = getEvents(timeline.events);
const isEventSelected = events.some((e) => selectedEventIds.includes(e.id));
- const [isExpanded, setIsExpanded] = useState(isDefault || isEventSelected);
+ const hasSelection = selectedEventIds.length > 0;
+ const prevHasSelectionRef = useRef(hasSelection);
+ const [isExpanded, setIsExpanded] = useState(
+ hasSelection ? isEventSelected : Boolean(isDefault),
+ );
const anyEventVisible = useMemo(
() => events.some((event) => visibleEventIds.includes(event.id)),
@@ -78,14 +76,21 @@ const TimelineCard = ({
);
useEffect(() => {
- if (isEventSelected) {
+ const prevHasSelection = prevHasSelectionRef.current;
+ prevHasSelectionRef.current = hasSelection;
+
+ if (hasSelection) {
setIsExpanded(isEventSelected);
+ } else if (prevHasSelection) {
+ setIsExpanded(Boolean(isDefault));
}
- }, [isEventSelected, selectedEventIds]);
+ }, [hasSelection, isEventSelected, isDefault, selectedEventIds]);
return (
- <CardRoot>
- <CardHeader
+ <Box className={S.root}>
+ <Flex
+ className={S.header}
+ align="center"
onClick={handleHeaderClick}
aria-label={t`Timeline card header`}
>
@@ -96,15 +101,28 @@ const TimelineCard = ({
onClick={handleCheckboxClick}
onChange={handleChangeVisibility}
/>
- <CardLabel>
- <Ellipsified tooltipProps={{ w: "auto" }}>
- {getTimelineName(timeline)}
- </Ellipsified>
- </CardLabel>
- <CardIcon name={isExpanded ? "chevronup" : "chevrondown"} />
- </CardHeader>
+
+ <Ellipsified
+ flex="1 1 auto"
+ miw={0}
+ mx="sm"
+ c="text-primary"
+ fz="md"
+ fw="bold"
+ lh="1.5rem"
+ tooltipProps={{ w: "auto" }}
+ >
+ {getTimelineName(timeline)}
+ </Ellipsified>
+ <Icon
+ name={isExpanded ? "chevronup" : "chevrondown"}
+ c="text-secondary"
+ flex="0 0 auto"
+ size={18}
+ />
+ </Flex>
{isExpanded && (
- <CardContent>
+ <Box my="md" mx="-lg">
{events.map((event) => (
<EventCard
key={event.id}
@@ -120,9 +138,9 @@ const TimelineCard = ({
onHideTimelineEvents={onHideTimelineEvents}
/>
))}
- </CardContent>
+ </Box>
)}
- </CardRoot>
+ </Box>
);
};
@@ -133,5 +151,4 @@ const getEvents = (events: TimelineEvent[] = []) => {
.value();
};
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default memo(TimelineCard);
+export const TimelineCard = memo(TimelineCardInner);
diff --git a/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.unit.spec.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.unit.spec.tsx
index 04727bcace1..339ead16dee 100644
--- a/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.unit.spec.tsx
@@ -6,8 +6,7 @@ import {
createMockTimelineEvent,
} from "metabase-types/api/mocks";
-import type { TimelineCardProps } from "./TimelineCard";
-import TimelineCard from "./TimelineCard";
+import { TimelineCard, type TimelineCardProps } from "./TimelineCard";
describe("TimelineCard", () => {
it("should expand and collapse the card", async () => {
@@ -28,6 +27,63 @@ describe("TimelineCard", () => {
expect(screen.queryByText("RC")).not.toBeInTheDocument();
});
+ it("should expand when one of its events is selected", () => {
+ const event = createMockTimelineEvent({ id: 1, name: "RC" });
+ const props = getProps({
+ timeline: createMockTimeline({ name: "Releases", events: [event] }),
+ selectedEventIds: [1],
+ });
+
+ render(<TimelineCard {...props} />);
+ expect(screen.getByText("RC")).toBeInTheDocument();
+ });
+
+ it("should re-expand after a manual collapse when the same selection is reapplied", async () => {
+ const event = createMockTimelineEvent({ id: 1, name: "RC" });
+ const props = getProps({
+ timeline: createMockTimeline({ name: "Releases", events: [event] }),
+ selectedEventIds: [1],
+ });
+
+ const { rerender } = render(<TimelineCard {...props} />);
+ expect(screen.getByText("RC")).toBeInTheDocument();
+
+ await userEvent.click(screen.getByText("Releases"));
+ expect(screen.queryByText("RC")).not.toBeInTheDocument();
+
+ // reapplying the selection (a new array, as the reducer produces) re-expands
+ rerender(<TimelineCard {...props} selectedEventIds={[1]} />);
+ expect(screen.getByText("RC")).toBeInTheDocument();
+ });
+
+ it("should collapse a default-expanded card when another timeline's event is selected", () => {
+ const event = createMockTimelineEvent({ id: 1, name: "RC" });
+ const props = getProps({
+ timeline: createMockTimeline({ name: "Releases", events: [event] }),
+ isDefault: true,
+ // a selection exists, but it belongs to a different timeline
+ selectedEventIds: [999],
+ });
+
+ render(<TimelineCard {...props} />);
+ expect(screen.queryByText("RC")).not.toBeInTheDocument();
+ });
+
+ it("should restore the default expansion when the selection clears", () => {
+ const event = createMockTimelineEvent({ id: 1, name: "RC" });
+ const props = getProps({
+ timeline: createMockTimeline({ name: "Releases", events: [event] }),
+ isDefault: true,
+ selectedEventIds: [999],
+ });
+
+ const { rerender } = render(<TimelineCard {...props} />);
+ expect(screen.queryByText("RC")).not.toBeInTheDocument();
+
+ rerender(<TimelineCard {...props} selectedEventIds={[]} />);
+ expect(screen.getByText("RC")).toBeInTheDocument();
+ });
+
it("should toggle visibility of the card", async () => {
const props = getProps({
timeline: createMockTimeline({
diff --git a/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.tsx
index d5843111cea..108d12a6a50 100644
--- a/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.tsx
+++ b/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.tsx
@@ -1,4 +1,4 @@
-import TimelineCard from "metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard";
+import { TimelineCard } from "metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard";
import type { Timeline, TimelineEvent } from "metabase-types/api";
export interface TimelineListProps {
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx
index c4f8fe9fe59..a1e0e7ba318 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx
@@ -1,12 +1,21 @@
-import type { Dayjs } from "dayjs";
-import { useCallback } from "react";
+import dayjs, { type Dayjs, type OpUnitType } from "dayjs";
+import { useCallback, useMemo } from "react";
import { t } from "ttag";
import { SidebarContent } from "metabase/common/components/SidebarContent";
import TimelinePanel from "metabase/query_builder/components/timelines/containers/TimelinePanel";
+import {
+ getTimeseriesDataInterval,
+ getUiControls,
+} from "metabase/query_builder/selectors";
import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
+import { useDispatch, useSelector } from "metabase/redux";
+import { onOpenTimelines } from "metabase/redux/query-builder";
+import { Box, Button, Icon } from "metabase/ui";
+import type { CartesianChartDateTimeAbsoluteUnit } from "metabase/visualizations/echarts/cartesian/model/types";
+import { formatDateTimeWithUnit } from "metabase/visualizations/lib/formatting/date";
import type Question from "metabase-lib/v1/Question";
-import type { Timeline, TimelineEvent } from "metabase-types/api";
+import type { DatetimeUnit, Timeline, TimelineEvent } from "metabase-types/api";
export interface TimelineSidebarProps {
question: Question;
@@ -35,6 +44,31 @@ export const TimelineSidebar = ({
onDeselectTimelineEvents,
onClose,
}: TimelineSidebarProps) => {
+ const dispatch = useDispatch();
+ const { focusedTimelineEventIds } = useSelector(getUiControls);
+ const dataInterval = useSelector(getTimeseriesDataInterval);
+
+ const displayedTimelines = useMemo(
+ () => getFocusedTimelines(timelines, focusedTimelineEventIds),
+ [timelines, focusedTimelineEventIds],
+ );
+
+ const focusedXDomain = useMemo(
+ () =>
+ focusedTimelineEventIds != null
+ ? getEventsXDomain(displayedTimelines)
+ : undefined,
+ [focusedTimelineEventIds, displayedTimelines],
+ );
+
+ const title = focusedXDomain
+ ? formatTitle(focusedXDomain, toDatetimeUnit(dataInterval?.unit))
+ : formatTitle(xDomain);
+
+ const handleShowAllEvents = useCallback(() => {
+ dispatch(onOpenTimelines());
+ }, [dispatch]);
+
const handleNewEvent = useCallback(() => {
onOpenModal?.(MODAL_TYPES.NEW_EVENT);
}, [onOpenModal]);
@@ -65,9 +99,22 @@ export const TimelineSidebar = ({
);
return (
- <SidebarContent title={formatTitle(xDomain)} onClose={onClose}>
+ <SidebarContent title={title} onClose={onClose}>
+ {focusedTimelineEventIds != null && (
+ <Box mx="lg" mb="sm">
+ <Button
+ p={0}
+ variant="subtle"
+ leftSection={<Icon name="chevronleft" />}
+ onClick={handleShowAllEvents}
+ data-testid="timeline-sidebar-show-all"
+ >
+ {t`All events`}
+ </Button>
+ </Box>
+ )}
<TimelinePanel
- timelines={timelines}
+ timelines={displayedTimelines}
collectionId={question.collectionId()}
visibleEventIds={visibleTimelineEventIds}
selectedEventIds={selectedTimelineEventIds}
@@ -82,12 +129,66 @@ export const TimelineSidebar = ({
);
};
-const formatTitle = (xDomain?: [Dayjs, Dayjs]) => {
- return xDomain
- ? t`Events between ${formatDate(xDomain[0])} and ${formatDate(xDomain[1])}`
- : t`Events`;
+export const getFocusedTimelines = (
+ timelines: Timeline[],
+ focusedTimelineEventIds: number[] | null,
+): Timeline[] => {
+ if (focusedTimelineEventIds == null) {
+ return timelines;
+ }
+ const focusedIds = new Set(focusedTimelineEventIds);
+ return timelines
+ .map((timeline) => ({
+ ...timeline,
+ events: (timeline.events ?? []).filter((event) =>
+ focusedIds.has(event.id),
+ ),
+ }))
+ .filter((timeline) => timeline.events.length > 0);
+};
+
+export const getEventsXDomain = (
+ timelines: Timeline[],
+): [Dayjs, Dayjs] | undefined => {
+ const timestamps = timelines
+ .flatMap((timeline) => timeline.events ?? [])
+ .map((event) => dayjs.utc(event.timestamp));
+
+ if (timestamps.length === 0) {
+ return undefined;
+ }
+
+ const min = timestamps.reduce((a, b) => (b.isBefore(a) ? b : a));
+ const max = timestamps.reduce((a, b) => (b.isAfter(a) ? b : a));
+ return [min, max];
+};
+
+const toDatetimeUnit = (
+ unit?: CartesianChartDateTimeAbsoluteUnit,
+): DatetimeUnit | undefined =>
+ unit == null || unit === "second" || unit === "ms" ? undefined : unit;
+
+const isPeriodUnit = (unit?: DatetimeUnit) =>
+ unit === "week" || unit === "month" || unit === "quarter" || unit === "year";
+
+export const formatTitle = (xDomain?: [Dayjs, Dayjs], unit?: DatetimeUnit) => {
+ if (!xDomain) {
+ return t`Events`;
+ }
+ const startLabel = formatDate(xDomain[0], unit);
+ const endLabel = formatDate(xDomain[1], unit);
+ if (startLabel !== endLabel) {
+ return t`Events between ${startLabel} and ${endLabel}`;
+ }
+
+ return isPeriodUnit(unit)
+ ? t`Events in ${startLabel}`
+ : t`Events on ${startLabel}`;
};
-const formatDate = (date: Dayjs) => {
- return date.format("ll");
+const formatDate = (date: Dayjs, unit?: DatetimeUnit) => {
+ if (unit == null) {
+ return date.format("ll");
+ }
+ return formatDateTimeWithUnit(date.startOf(unit as OpUnitType), unit);
};
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.unit.spec.ts b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.unit.spec.ts
new file mode 100644
index 00000000000..e53a3686c98
--- /dev/null
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.unit.spec.ts
@@ -0,0 +1,127 @@
+import dayjs from "dayjs";
+
+import {
+ createMockTimeline,
+ createMockTimelineEvent,
+} from "metabase-types/api/mocks";
+
+import {
+ formatTitle,
+ getEventsXDomain,
+ getFocusedTimelines,
+} from "./TimelineSidebar";
+
+const releases = createMockTimeline({
+ id: 1,
+ name: "Releases",
+ events: [
+ createMockTimelineEvent({ id: 1, name: "RC1" }),
+ createMockTimelineEvent({ id: 2, name: "RC2" }),
+ ],
+});
+
+const marketing = createMockTimeline({
+ id: 2,
+ name: "Marketing",
+ events: [createMockTimelineEvent({ id: 3, name: "Launch" })],
+});
+
+describe("getFocusedTimelines", () => {
+ it("returns all timelines unchanged when there is no focus", () => {
+ expect(getFocusedTimelines([releases, marketing], null)).toEqual([
+ releases,
+ marketing,
+ ]);
+ });
+
+ it("keeps only the focused events within each timeline", () => {
+ const result = getFocusedTimelines([releases, marketing], [2]);
+ expect(result).toHaveLength(1);
+ expect(result[0].name).toBe("Releases");
+ expect(result[0].events?.map((event) => event.id)).toEqual([2]);
+ });
+
+ it("drops timelines that have no focused events", () => {
+ const result = getFocusedTimelines([releases, marketing], [3]);
+ expect(result.map((timeline) => timeline.name)).toEqual(["Marketing"]);
+ });
+
+ it("can focus events across multiple timelines", () => {
+ const result = getFocusedTimelines([releases, marketing], [1, 3]);
+ expect(result.map((timeline) => timeline.name)).toEqual([
+ "Releases",
+ "Marketing",
+ ]);
+ expect(result[0].events?.map((event) => event.id)).toEqual([1]);
+ expect(result[1].events?.map((event) => event.id)).toEqual([3]);
+ });
+});
+
+describe("getEventsXDomain", () => {
+ it("returns undefined when there are no events", () => {
+ expect(
+ getEventsXDomain([createMockTimeline({ events: [] })]),
+ ).toBeUndefined();
+ });
+
+ it("returns the min and max event timestamps across timelines", () => {
+ const timelines = [
+ createMockTimeline({
+ events: [
+ createMockTimelineEvent({ timestamp: "2027-06-15T00:00:00Z" }),
+ createMockTimelineEvent({ timestamp: "2027-06-03T00:00:00Z" }),
+ ],
+ }),
+ createMockTimeline({
+ events: [
+ createMockTimelineEvent({ timestamp: "2027-06-27T00:00:00Z" }),
+ ],
+ }),
+ ];
+
+ const domain = getEventsXDomain(timelines);
+ expect(domain?.[0].toISOString()).toBe("2027-06-03T00:00:00.000Z");
+ expect(domain?.[1].toISOString()).toBe("2027-06-27T00:00:00.000Z");
+ expect(domain?.[0].utcOffset()).toBe(0);
+ });
+});
+
+describe("formatTitle", () => {
+ const june3 = dayjs("2027-06-03T00:00:00Z");
+ const june27 = dayjs("2027-06-27T00:00:00Z");
+ const july5 = dayjs("2027-07-05T00:00:00Z");
+
+ it("returns a generic title without a domain", () => {
+ expect(formatTitle()).toBe("Events");
+ });
+
+ it("snaps same-week dates to one week bucket (Jun 7 and Jun 10 are both the week of Jun 6)", () => {
+ const june7 = dayjs.utc("2027-06-07T00:00:00Z");
+ const june10 = dayjs.utc("2027-06-10T00:00:00Z");
+ expect(formatTitle([june7, june10], "week")).toBe("Events in June 6, 2027");
+ });
+
+ it("buckets a single month group to the chart granularity", () => {
+ expect(formatTitle([june3, june27], "month")).toBe("Events in June 2027");
+ });
+
+ it("buckets a single year group to the chart granularity", () => {
+ expect(formatTitle([june3, june27], "year")).toBe("Events in 2027");
+ });
+
+ it("uses 'on' for a single day", () => {
+ expect(formatTitle([june3, june3], "day")).toBe("Events on June 3, 2027");
+ });
+
+ it("shows a bucket range when the group spans multiple buckets", () => {
+ expect(formatTitle([june27, july5], "month")).toBe(
+ "Events between June 2027 and July 2027",
+ );
+ });
+
+ it("falls back to specific dates without a unit", () => {
+ expect(formatTitle([june3, june27])).toBe(
+ "Events between Jun 3, 2027 and Jun 27, 2027",
+ );
+ });
+});
diff --git a/frontend/src/metabase/query_builder/defaults.ts b/frontend/src/metabase/query_builder/defaults.ts
index 17e3848c163..6127c9638dc 100644
--- a/frontend/src/metabase/query_builder/defaults.ts
+++ b/frontend/src/metabase/query_builder/defaults.ts
@@ -16,6 +16,7 @@ export const DEFAULT_UI_CONTROLS: QueryBuilderUIControls = {
isShowingChartSettingsSidebar: false,
isShowingQuestionInfoSidebar: false,
isShowingTimelineSidebar: false,
+ focusedTimelineEventIds: null,
isShowingAIQuestionAnalysisSidebar: false,
isNativeEditorOpen: false,
initialChartSetting: {},
@@ -58,6 +59,7 @@ export const UI_CONTROLS_SIDEBAR_DEFAULTS: Partial<QueryBuilderUIControls> = {
isShowingChartTypeSidebar: false,
isShowingAIQuestionAnalysisSidebar: false,
isShowingTimelineSidebar: false,
+ focusedTimelineEventIds: null,
isShowingQuestionInfoSidebar: false,
isShowingDataReference: false,
};
@@ -68,4 +70,5 @@ export const CLOSED_NATIVE_EDITOR_SIDEBARS: Partial<QueryBuilderUIControls> = {
isShowingSnippetSidebar: false,
isShowingDataReference: false,
isShowingTimelineSidebar: false,
+ focusedTimelineEventIds: null,
};
diff --git a/frontend/src/metabase/query_builder/reducers.ts b/frontend/src/metabase/query_builder/reducers.ts
index 1b886b42fb7..3e305941984 100644
--- a/frontend/src/metabase/query_builder/reducers.ts
+++ b/frontend/src/metabase/query_builder/reducers.ts
@@ -325,12 +325,16 @@ export const uiControls = createReducer<QueryBuilderUIControls>(
...state,
isShowingQuestionSettingsSidebar: false,
}))
- .addCase(OPEN_TIMELINES, (state) => ({
- ...state,
- ...UI_CONTROLS_SIDEBAR_DEFAULTS,
- ...CLOSED_NATIVE_EDITOR_SIDEBARS,
- isShowingTimelineSidebar: true,
- }))
+ .addCase<string, { type: string; payload: number[] | undefined }>(
+ OPEN_TIMELINES,
+ (state, action) => ({
+ ...state,
+ ...UI_CONTROLS_SIDEBAR_DEFAULTS,
+ ...CLOSED_NATIVE_EDITOR_SIDEBARS,
+ isShowingTimelineSidebar: true,
+ focusedTimelineEventIds: action.payload ?? null,
+ }),
+ )
.addCase(CLOSE_TIMELINES, (state) => ({
...state,
...UI_CONTROLS_SIDEBAR_DEFAULTS,
diff --git a/frontend/src/metabase/query_builder/selectors.ts b/frontend/src/metabase/query_builder/selectors.ts
index 3ef2e70734f..acde86aad56 100644
--- a/frontend/src/metabase/query_builder/selectors.ts
+++ b/frontend/src/metabase/query_builder/selectors.ts
@@ -792,7 +792,7 @@ export const getTimeseriesXValues = createSelector(
: null,
);
-const getTimeseriesDataInterval = createSelector(
+export const getTimeseriesDataInterval = createSelector(
[
getTransformedSeries,
getVisualizationSettings,
diff --git a/frontend/src/metabase/redux/store/mocks/qb.ts b/frontend/src/metabase/redux/store/mocks/qb.ts
index 92cce344483..4a7670e9855 100644
--- a/frontend/src/metabase/redux/store/mocks/qb.ts
+++ b/frontend/src/metabase/redux/store/mocks/qb.ts
@@ -19,6 +19,7 @@ export const createMockQueryBuilderUIControlsState = (
isShowingQuestionInfoSidebar: false,
isShowingSnippetSidebar: false,
isShowingTimelineSidebar: false,
+ focusedTimelineEventIds: null,
isShowingAIQuestionAnalysisSidebar: false,
initialChartSetting: {},
isShowingRawTable: false,
diff --git a/frontend/src/metabase/redux/store/qb.ts b/frontend/src/metabase/redux/store/qb.ts
index 43cd3b55415..50e5234548a 100644
--- a/frontend/src/metabase/redux/store/qb.ts
+++ b/frontend/src/metabase/redux/store/qb.ts
@@ -46,6 +46,7 @@ export interface QueryBuilderUIControls {
isShowingQuestionInfoSidebar: boolean;
isShowingSnippetSidebar: boolean;
isShowingTimelineSidebar: boolean;
+ focusedTimelineEventIds: number[] | null;
isNativeEditorOpen: boolean;
isShowingAIQuestionAnalysisSidebar: boolean;
initialChartSetting: InitialChartSettingState;
diff --git a/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.tsx b/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.tsx
index 2f91b2e0998..3d6b6fa3098 100644
--- a/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.tsx
+++ b/frontend/src/metabase/static-viz/components/BoxPlotChart/BoxPlotChart.tsx
@@ -72,8 +72,6 @@ export function BoxPlotChart({
const option = getBoxPlotOption(
chartModel,
layoutModel,
- null,
- [],
settings,
false,
renderingContext,
diff --git a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx
index a3ebc219304..ae5ec49d8f4 100644
--- a/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx
+++ b/frontend/src/metabase/static-viz/components/ComboChart/ComboChart.tsx
@@ -76,6 +76,7 @@ export const ComboChart = ({
const option = getCartesianChartOption(
chartModel,
chartLayout,
+ false,
null,
[],
settings,
diff --git a/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.tsx b/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.tsx
index f795a8eef55..987813094c3 100644
--- a/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.tsx
+++ b/frontend/src/metabase/static-viz/components/ScatterPlot/ScatterPlot.tsx
@@ -67,6 +67,7 @@ export function ScatterPlot({
const option = getScatterPlotOption(
chartModel,
chartLayout,
+ false,
null,
[],
settings,
diff --git a/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.tsx b/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.tsx
index 38565ddfbf3..1b2d3ebe84b 100644
--- a/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.tsx
+++ b/frontend/src/metabase/static-viz/components/WaterfallChart/WaterfallChart.tsx
@@ -41,6 +41,7 @@ export function WaterfallChart({
chartModel,
width,
chartLayout,
+ false,
null,
[],
settings,
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/bell.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/bell.svg
index 62487b99c30..7be68b168ce 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/bell.svg
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/bell.svg
@@ -1,3 +1,3 @@
-<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <path d="M7.076 2.117A1 1 0 0 0 7 2.5h2a1 1 0 0 0-1.924-.383z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M2.75 7.5v2.75H2a.75.75 0 0 0 0 1.5h12a.75.75 0 0 0 0-1.5h-.75V7.5A4.75 4.75 0 0 0 8.5 2.75h-1A4.75 4.75 0 0 0 2.75 7.5zM7.5 4.25A3.25 3.25 0 0 0 4.25 7.5v2.75h7.5V7.5A3.25 3.25 0 0 0 8.5 4.25h-1z" /><path d="M9.945 14.116a2.75 2.75 0 0 1-3.89 0l-.085-.086a.75.75 0 0 1 .53-1.28h3a.75.75 0 0 1 .53 1.28l-.085.086z" />
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M7.25 13.5C7.25 13.9142 7.58579 14.25 8 14.25C8.41421 14.25 8.75 13.9142 8.75 13.5H10.25C10.25 14.7426 9.24264 15.75 8 15.75C6.75736 15.75 5.75 14.7426 5.75 13.5H7.25ZM7.75 1.25C10.2239 1.25 12.3243 3.06337 12.6855 5.51074L13.1328 8.54688L13.1475 8.55273C13.8129 8.81793 14.2499 9.46144 14.25 10.1777V12C14.25 12.4142 13.9142 12.75 13.5 12.75H2C1.58579 12.75 1.25 12.4142 1.25 12V10.1777C1.25009 9.46144 1.68713 8.81793 2.35254 8.55273L2.36621 8.54688L2.81445 5.51074C3.17567 3.06337 5.27611 1.25 7.75 1.25ZM7.75 2.75C6.01995 2.75 4.55144 4.01798 4.29883 5.72949L3.78711 9.19238C3.74807 9.45687 3.5716 9.68128 3.32324 9.78027L2.90723 9.94531C2.81225 9.98319 2.75009 10.0755 2.75 10.1777V11.25H12.75V10.1777C12.7499 10.0755 12.6877 9.98319 12.5928 9.94531L12.1768 9.78027C11.9284 9.68128 11.7519 9.45687 11.7129 9.19238L11.2012 5.72949C10.9486 4.01798 9.48005 2.75 7.75 2.75Z"/>
</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/bell_12.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/bell_12.svg
new file mode 100644
index 00000000000..4b1dbdb12f9
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/bell_12.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 12 12" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M7.5 10C7.5 10.8284 6.82843 11.5 6 11.5C5.17157 11.5 4.5 10.8284 4.5 10H7.5ZM6 0.424805C7.54855 0.424805 8.91136 1.44651 9.34668 2.93262L9.99121 5.13281L10.3516 5.36426C10.8022 5.654 11.0751 6.15271 11.0752 6.68848V8.5C11.0752 8.81756 10.8176 9.0752 10.5 9.0752H1.5C1.18244 9.0752 0.924805 8.81756 0.924805 8.5V6.68848C0.924917 6.15271 1.19776 5.654 1.64844 5.36426L2.00781 5.13281L2.65332 2.93262C3.08864 1.44651 4.45145 0.424805 6 0.424805ZM6 1.5752C4.96207 1.5752 4.04862 2.25978 3.75684 3.25586L3.05176 5.66211C3.01278 5.79476 2.92685 5.90863 2.81055 5.9834L2.27051 6.33105C2.14896 6.40919 2.07531 6.54399 2.0752 6.68848V7.9248H9.9248V6.68848C9.92469 6.54399 9.85104 6.40919 9.72949 6.33105L9.18945 5.9834C9.07315 5.90863 8.98722 5.79476 8.94824 5.66211L8.24316 3.25586C7.95138 2.25978 7.03793 1.5752 6 1.5752Z" />
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/cake.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/cake.svg
new file mode 100644
index 00000000000..15591e3d40f
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/cake.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M9.5 1.25C11.0188 1.25 12.25 2.48122 12.25 4C12.25 4.19491 12.229 4.38492 12.1904 4.56836L14.6289 6.62695C15.0228 6.95946 15.25 7.44941 15.25 7.96484V12C15.25 13.5188 14.0188 14.75 12.5 14.75H3.5C1.98122 14.75 0.75 13.5188 0.75 12V8.07227C0.750154 7.45166 1.07902 6.8776 1.61426 6.56348L6.79297 3.52344C7.01876 2.23195 8.14386 1.25 9.5 1.25ZM2.25 12C2.25 12.6904 2.80964 13.25 3.5 13.25H12.5C13.1904 13.25 13.75 12.6904 13.75 12V9.25H2.25V12ZM2.55566 7.75H13.6338L11.4658 5.91992C10.9665 6.43113 10.2711 6.75 9.5 6.75C8.38888 6.75 7.4338 6.09005 7 5.1416L2.55566 7.75ZM9.5 2.75C8.80964 2.75 8.25 3.30964 8.25 4C8.25 4.69036 8.80964 5.25 9.5 5.25C10.1904 5.25 10.75 4.69036 10.75 4C10.75 3.30964 10.1904 2.75 9.5 2.75Z"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/cloud_12.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/cloud_12.svg
new file mode 100644
index 00000000000..0f4859553c4
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/cloud_12.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 12 12" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M9.4248 5.5C9.4248 3.88457 8.11543 2.5752 6.5 2.5752C5.01416 2.5752 3.787 3.6838 3.60059 5.11914L3.54688 5.53223L3.1377 5.60938C2.24754 5.77866 1.5752 6.56145 1.5752 7.5C1.5752 8.56315 2.43685 9.4248 3.5 9.4248H9C9.78701 9.4248 10.4248 8.78701 10.4248 8C10.4248 7.45185 10.115 6.97511 9.65723 6.73633L9.27051 6.53418L9.36035 6.10742C9.40217 5.90935 9.4248 5.70649 9.4248 5.5ZM10.5752 5.5C10.5752 5.6514 10.5652 5.80021 10.5488 5.94629C11.1703 6.41532 11.5752 7.15887 11.5752 8C11.5752 9.42213 10.4221 10.5752 9 10.5752H3.5C1.80172 10.5752 0.424805 9.19828 0.424805 7.5C0.424805 6.14066 1.30736 4.99158 2.5293 4.58496C2.94472 2.77506 4.56371 1.4248 6.5 1.4248C8.75056 1.4248 10.5752 3.24944 10.5752 5.5Z" />
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/event.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/event.svg
new file mode 100644
index 00000000000..bbd4d3037c0
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/event.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M5.75 2.25H10.25V1H11.75V2.25H12C13.5188 2.25 14.75 3.48122 14.75 5V8.5H13.25V7.75H2.75V12C2.75 12.6904 3.30964 13.25 4 13.25H8V14.75H4C2.48122 14.75 1.25 13.5188 1.25 12V5C1.25 3.48122 2.48122 2.25 4 2.25H4.25V1H5.75V2.25ZM12 9.25C13.5188 9.25 14.75 10.4812 14.75 12C14.75 13.5188 13.5188 14.75 12 14.75C10.4812 14.75 9.25 13.5188 9.25 12C9.25 10.4812 10.4812 9.25 12 9.25ZM12 10.75C11.3096 10.75 10.75 11.3096 10.75 12C10.75 12.6904 11.3096 13.25 12 13.25C12.6904 13.25 13.25 12.6904 13.25 12C13.25 11.3096 12.6904 10.75 12 10.75ZM4 3.75C3.30964 3.75 2.75 4.30964 2.75 5V6.25H13.25V5C13.25 4.30964 12.6904 3.75 12 3.75H4Z"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
index 987d12423c6..764c49777a3 100644
--- a/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/index.ts
@@ -58,6 +58,8 @@ import bar_component from "./bar.svg?component";
import bar_source from "./bar.svg?source";
import bell_component from "./bell.svg?component";
import bell_source from "./bell.svg?source";
+import bell_12_component from "./bell_12.svg?component";
+import bell_12_source from "./bell_12.svg?source";
import birthday_component from "./birthday.svg?component";
import birthday_source from "./birthday.svg?source";
import bolt_component from "./bolt.svg?component";
@@ -82,6 +84,8 @@ import bug_component from "./bug.svg?component";
import bug_source from "./bug.svg?source";
import burger_component from "./burger.svg?component";
import burger_source from "./burger.svg?source";
+import cake_component from "./cake.svg?component";
+import cake_source from "./cake.svg?source";
import calendar_component from "./calendar.svg?component";
import calendar_source from "./calendar.svg?source";
import camera_component from "./camera.svg?component";
@@ -114,6 +118,8 @@ import close_component from "./close.svg?component";
import close_source from "./close.svg?source";
import cloud_component from "./cloud.svg?component";
import cloud_source from "./cloud.svg?source";
+import cloud_12_component from "./cloud_12.svg?component";
+import cloud_12_source from "./cloud_12.svg?source";
import cloud_filled_component from "./cloud_filled.svg?component";
import cloud_filled_source from "./cloud_filled.svg?source";
import code_block_component from "./code_block.svg?component";
@@ -180,6 +186,8 @@ import empty_component from "./empty.svg?component";
import empty_source from "./empty.svg?source";
import enter_or_return_component from "./enter_or_return.svg?component";
import enter_or_return_source from "./enter_or_return.svg?source";
+import event_component from "./event.svg?component";
+import event_source from "./event.svg?source";
import exit_component from "./exit.svg?component";
import exit_source from "./exit.svg?source";
import expand_component from "./expand.svg?component";
@@ -318,6 +326,8 @@ import lock_filled_component from "./lock_filled.svg?component";
import lock_filled_source from "./lock_filled.svg?source";
import mail_component from "./mail.svg?component";
import mail_source from "./mail.svg?source";
+import mail_at_component from "./mail_at.svg?component";
+import mail_at_source from "./mail_at.svg?source";
import mail_filled_component from "./mail_filled.svg?component";
import mail_filled_source from "./mail_filled.svg?source";
import mcp_component from "./mcp.svg?component";
@@ -348,6 +358,10 @@ import network_component from "./network.svg?component";
import network_source from "./network.svg?source";
import new_folder_component from "./new_folder.svg?component";
import new_folder_source from "./new_folder.svg?source";
+import note_component from "./note.svg?component";
+import note_source from "./note.svg?source";
+import note_12_component from "./note_12.svg?component";
+import note_12_source from "./note_12.svg?source";
import notebook_component from "./notebook.svg?component";
import notebook_source from "./notebook.svg?source";
import number_component from "./number.svg?component";
@@ -697,6 +711,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: bell_component,
source: bell_source,
},
+ bell_12: {
+ component: bell_12_component,
+ source: bell_12_source,
+ },
birthday: {
component: birthday_component,
source: birthday_source,
@@ -741,6 +759,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: burger_component,
source: burger_source,
},
+ cake: {
+ component: cake_component,
+ source: cake_source,
+ },
calendar: {
component: calendar_component,
source: calendar_source,
@@ -809,6 +831,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: cloud_component,
source: cloud_source,
},
+ cloud_12: {
+ component: cloud_12_component,
+ source: cloud_12_source,
+ },
cloud_filled: {
component: cloud_filled_component,
source: cloud_filled_source,
@@ -921,6 +947,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: enter_or_return_component,
source: enter_or_return_source,
},
+ event: {
+ component: event_component,
+ source: event_source,
+ },
exit: {
component: exit_component,
source: exit_source,
@@ -1201,6 +1231,10 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: mail_component,
source: mail_source,
},
+ mail_at: {
+ component: mail_at_component,
+ source: mail_at_source,
+ },
mail_filled: {
component: mail_filled_component,
source: mail_filled_source,
@@ -1261,6 +1295,14 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: new_folder_component,
source: new_folder_source,
},
+ note: {
+ component: note_component,
+ source: note_source,
+ },
+ note_12: {
+ component: note_12_component,
+ source: note_12_source,
+ },
notebook: {
component: notebook_component,
source: notebook_source,
@@ -1756,10 +1798,6 @@ export const Icons: Record<IconName, { component: React.VFC; source: string }> =
component: number_component,
source: number_source,
},
- cake: {
- component: birthday_component,
- source: birthday_source,
- },
external: { component: share_component, source: share_source },
collection: { component: folder_component, source: folder_source },
collection2: {
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/mail_at.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/mail_at.svg
new file mode 100644
index 00000000000..1c617c15cd1
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/mail_at.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M8 4.25C8.84405 4.25 9.62331 4.52841 10.25 4.99902V4.5H11.75V9.25C11.75 9.80228 12.1977 10.25 12.75 10.25C13.3023 10.25 13.75 9.80228 13.75 9.25V8C13.75 4.82436 11.1756 2.25 8 2.25C4.82436 2.25 2.25 4.82436 2.25 8C2.25 11.1756 4.82436 13.75 8 13.75H11V15.25H8C3.99594 15.25 0.75 12.0041 0.75 8C0.75 3.99594 3.99594 0.75 8 0.75C12.0041 0.75 15.25 3.99594 15.25 8V9.25C15.25 10.6307 14.1307 11.75 12.75 11.75C11.8808 11.75 11.1159 11.3059 10.668 10.6328C9.98801 11.3218 9.04448 11.75 8 11.75C5.92893 11.75 4.25 10.0711 4.25 8C4.25 5.92893 5.92893 4.25 8 4.25ZM8 5.75C6.75736 5.75 5.75 6.75736 5.75 8C5.75 9.24264 6.75736 10.25 8 10.25C9.24264 10.25 10.25 9.24264 10.25 8C10.25 6.75736 9.24264 5.75 8 5.75Z"/>
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/note.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/note.svg
new file mode 100644
index 00000000000..65e0f716c05
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/note.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 16 16" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M12 1.25C13.5188 1.25 14.75 2.48122 14.75 4V12C14.75 13.5188 13.5188 14.75 12 14.75H6.82812C6.09889 14.7499 5.39944 14.46 4.88379 13.9443L2.05566 11.1162C1.54001 10.6006 1.25008 9.90111 1.25 9.17188V4C1.25 2.48122 2.48122 1.25 4 1.25H12ZM4 2.75C3.30964 2.75 2.75 3.30964 2.75 4V9.17188C2.75001 9.19804 2.75227 9.22403 2.75391 9.25H5C5.9665 9.25 6.75 10.0335 6.75 11V13.2461C6.77597 13.2477 6.80196 13.25 6.82812 13.25H12C12.6904 13.25 13.25 12.6904 13.25 12V4C13.25 3.30964 12.6904 2.75 12 2.75H4ZM5.25 12.1895V11C5.25 10.8619 5.13807 10.75 5 10.75H3.81055L5.25 12.1895Z" />
+</svg>
diff --git a/frontend/src/metabase/ui/components/icons/Icon/icons/note_12.svg b/frontend/src/metabase/ui/components/icons/Icon/icons/note_12.svg
new file mode 100644
index 00000000000..fa61c02fd55
--- /dev/null
+++ b/frontend/src/metabase/ui/components/icons/Icon/icons/note_12.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 12 12" fill="currentcolor" xmlns="http://www.w3.org/2000/svg">
+ <path d="M9 0.424805C10.4221 0.424805 11.5752 1.57787 11.5752 3V9C11.5752 10.4221 10.4221 11.5752 9 11.5752H5.82812C5.1453 11.5751 4.49065 11.3031 4.00781 10.8203L1.17871 7.99219C0.696087 7.50939 0.424885 6.85454 0.424805 6.17188V3C0.424805 1.57787 1.57791 0.42483 3 0.424805H9ZM3 1.5752C2.213 1.57522 1.5752 2.21303 1.5752 3V6.17188C1.57521 6.25731 1.58368 6.34184 1.59863 6.4248H4C4.86985 6.4248 5.5752 7.13015 5.5752 8V10.4004C5.65822 10.4154 5.74263 10.4248 5.82812 10.4248H9C9.78701 10.4248 10.4248 9.78701 10.4248 9V3C10.4248 2.21299 9.78701 1.5752 9 1.5752H3ZM4.4248 9.6123V8C4.4248 7.76528 4.23472 7.5752 4 7.5752H2.3877L4.4248 9.6123Z" />
+</svg>
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx
index c8810af7009..68b8e4dc133 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/ChartTooltip.tsx
@@ -4,15 +4,11 @@ import _ from "underscore";
import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { Box, Portal, Tooltip } from "metabase/ui";
import { getEventTarget } from "metabase/utils/dom";
-import type {
- HoveredObject,
- HoveredTimelineEvent,
-} from "metabase/visualizations/types";
+import type { HoveredObject } from "metabase/visualizations/types";
import type { VisualizationSettings } from "metabase-types/api";
import KeyValuePairChartTooltip from "./KeyValuePairChartTooltip";
import StackedDataTooltip from "./StackedDataTooltip";
-import TimelineEventTooltip from "./TimelineEventTooltip";
export interface ChartTooltipProps {
hovered?: HoveredObject | null;
@@ -48,9 +44,6 @@ export const ChartTooltipContent = ({
if (!hovered) {
return null;
}
- if (!_.isEmpty(hovered.timelineEvents)) {
- return <TimelineEventTooltip hovered={hovered as HoveredTimelineEvent} />;
- }
if (hovered.stackedTooltipModel) {
return <StackedDataTooltip {...hovered.stackedTooltipModel} />;
@@ -76,7 +69,6 @@ const ChartTooltip = ({
}
return (
hovered.value !== undefined ||
- !_.isEmpty(hovered.timelineEvents) ||
!_.isEmpty(hovered.stackedTooltipModel) ||
!_.isEmpty(hovered.data) ||
!_.isEmpty(hovered.dimensions)
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/TimelineEventTooltip.module.css b/frontend/src/metabase/visualizations/components/ChartTooltip/TimelineEventTooltip.module.css
deleted file mode 100644
index c03d9a874c8..00000000000
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/TimelineEventTooltip.module.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.timelineEventList {
- max-width: 18.75rem;
-
- li:not(:first-of-type) {
- margin-top: var(--mantine-spacing-sm);
- }
-}
-
-.timelineEventDate {
- font-size: var(--mantine-font-size-sm);
- margin-top: 0.0625rem;
-}
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/TimelineEventTooltip.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/TimelineEventTooltip.tsx
deleted file mode 100644
index 4b18c292e02..00000000000
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/TimelineEventTooltip.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { DateTime } from "metabase/common/components/DateTime";
-import { Flex, Icon, Stack, Text } from "metabase/ui";
-import type { HoveredTimelineEvent } from "metabase/visualizations/types";
-import type { IconName } from "metabase-types/api";
-
-import S from "./TimelineEventTooltip.module.css";
-
-export interface TimelineEventTooltipProps {
- hovered: HoveredTimelineEvent;
-}
-
-const TimelineEventTooltip = (props: TimelineEventTooltipProps) => {
- const { hovered } = props;
- const { timelineEvents } = hovered;
-
- return (
- <ul className={S.timelineEventList} data-testid="timeline-event-tooltip">
- {timelineEvents.map((event) => (
- <li key={event.id}>
- <Flex>
- <Flex justify="center" align="center" pl="xs" pr="0.75rem">
- <Icon name={event.icon as unknown as IconName} />
- </Flex>
- <Stack gap={0}>
- <Text component="span" c="inherit" fz="md" fw="bold">
- {event.name}
- </Text>
- <DateTime
- className={S.timelineEventDate}
- value={event.timestamp}
- unit={event.time_matters ? "default" : "day"}
- />
- </Stack>
- </Flex>
- </li>
- ))}
- </ul>
- );
-};
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default TimelineEventTooltip;
diff --git a/frontend/src/metabase/visualizations/echarts/boxplot/option/index.ts b/frontend/src/metabase/visualizations/echarts/boxplot/option/index.ts
index 543e29ba736..396960031de 100644
--- a/frontend/src/metabase/visualizations/echarts/boxplot/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/boxplot/option/index.ts
@@ -12,13 +12,10 @@ import {
getGoalLineParams,
getGoalLineSeriesOption,
} from "metabase/visualizations/echarts/cartesian/option/goal-line";
-import { getTimelineEventsSeries } from "metabase/visualizations/echarts/cartesian/timeline-events/option";
-import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
import type {
ComputedVisualizationSettings,
RenderingContext,
} from "metabase/visualizations/types";
-import type { TimelineEventId } from "metabase-types/api";
import { BOXPLOT_STATS } from "../constants";
import type { BoxPlotLayoutModel } from "../layout/types";
@@ -67,8 +64,6 @@ const buildBoxPlotYAxisOption = (
export const getBoxPlotOption = (
chartModel: BoxPlotChartModel,
layoutModel: BoxPlotLayoutModel,
- timelineEventsModel: TimelineEventsModel | null,
- selectedTimelineEventsIds: TimelineEventId[],
settings: ComputedVisualizationSettings,
isAnimated: boolean,
renderingContext: RenderingContext,
@@ -81,15 +76,6 @@ export const getBoxPlotOption = (
const { adjustedPadding, sideLabelOverflow, xAxisOffset } = layoutModel;
- const hasTimelineEvents = timelineEventsModel != null;
- const timelineEventsSeries = hasTimelineEvents
- ? getTimelineEventsSeries(
- timelineEventsModel,
- selectedTimelineEventsIds,
- renderingContext,
- )
- : null;
-
const pointsDatasetIndices = {
outlierAbove: chartModel.outlierAbovePointsDataset.length > 0 ? 1 : -1,
outlierBelow: -1,
@@ -142,7 +128,6 @@ export const getBoxPlotOption = (
...meanSeries,
...labelsSeries,
goalSeriesOption,
- timelineEventsSeries,
].flatMap((option) => option ?? []);
const xAxis = buildCategoricalDimensionAxis(
diff --git a/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx
index 3c28b197843..d9156abf0ca 100644
--- a/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx
+++ b/frontend/src/metabase/visualizations/echarts/boxplot/option/tooltip.tsx
@@ -2,10 +2,7 @@ import type { TooltipOption } from "echarts/types/dist/shared";
import { reactNodeToHtmlString } from "metabase/utils/react-to-html";
import { EChartsTooltip } from "metabase/visualizations/components/ChartTooltip/EChartsTooltip";
-import {
- GOAL_LINE_SERIES_ID,
- TIMELINE_EVENT_SERIES_ID,
-} from "metabase/visualizations/echarts/cartesian/constants/dataset";
+import { GOAL_LINE_SERIES_ID } from "metabase/visualizations/echarts/cartesian/constants/dataset";
import { getTooltipBaseOption } from "metabase/visualizations/echarts/tooltip";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
@@ -64,10 +61,7 @@ export const getBoxPlotTooltipOption = (
const { dataIndex, seriesId, seriesName, data } = params;
- if (
- seriesId === TIMELINE_EVENT_SERIES_ID ||
- seriesId === GOAL_LINE_SERIES_ID
- ) {
+ if (seriesId === GOAL_LINE_SERIES_ID) {
return "";
}
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/constants/dataset.ts b/frontend/src/metabase/visualizations/echarts/cartesian/constants/dataset.ts
index 0ec6bc52dab..dab5ccce553 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/constants/dataset.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/constants/dataset.ts
@@ -42,7 +42,3 @@ export const TICKS_INTERVAL_THRESHOLD = 3;
export const ECHARTS_CATEGORY_AXIS_NULL_VALUE = `${NULL_CHAR}_NULL` as const;
export const GOAL_LINE_SERIES_ID = `${NULL_CHAR}_goal_line` as const;
-
-export const TIMELINE_EVENT_SERIES_ID = `${NULL_CHAR}_timeline_events`;
-
-export const TIMELINE_EVENT_DATA_NAME = `${NULL_CHAR}_timeline_event`;
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.ts b/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.ts
index 9c7c3bcc39b..3199a2fd852 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/constants/style.ts
@@ -8,8 +8,6 @@ export const LINE_SIZE: Record<LineSize, number> = {
export const Z_INDEXES = {
brushMirror: 100,
- // Note: timeline events use echarts' markline option, which has a fixed z
- // value of 5.
dataLabels: 8,
goalLine: 7,
trendLine: 7,
@@ -17,6 +15,20 @@ export const Z_INDEXES = {
series: 6, // Bars needs to have a lower z value than line/area series, see issue #40209
};
+export const TIMELINE_EVENTS_BAND = {
+ chipWidth: 32,
+ chipHeight: 24,
+ bandPaddingY: 4,
+ marginY: 8,
+ chipGap: 2,
+};
+
+export const TIMELINE_BAND_HEIGHT =
+ TIMELINE_EVENTS_BAND.chipHeight + 2 * TIMELINE_EVENTS_BAND.bandPaddingY;
+
+const TIMELINE_BAND_RESERVED_HEIGHT =
+ TIMELINE_BAND_HEIGHT + 2 * TIMELINE_EVENTS_BAND.marginY;
+
export const CHART_STYLE = {
series: {
barWidth: 0.8,
@@ -43,9 +55,10 @@ export const CHART_STYLE = {
},
symbolSize: 6,
timelineEvents: {
- height: 14,
- minDistance: 16,
+ height: TIMELINE_BAND_RESERVED_HEIGHT,
+ minDistance: TIMELINE_EVENTS_BAND.chipWidth + TIMELINE_EVENTS_BAND.chipGap, // Min center-to-center distance before chips merge
countLabelMargin: 4,
+ selectionLineWidth: 2,
},
goalLine: {
label: {
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts
index ac732c2886e..ac69137113d 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/layout/index.ts
@@ -497,10 +497,9 @@ const getTicksDimensions = (
ticksDimensions.xTicksHeight =
getXAxisTicksHeight(maxXTickWidth, axisEnabledSetting, renderingContext) +
- CHART_STYLE.axisTicksMarginX +
(isTimeSeries && hasTimelineEvents
? CHART_STYLE.timelineEvents.height
- : 0);
+ : CHART_STYLE.axisTicksMarginX);
ticksDimensions.getXTickWidth = (text: string) => {
if (axisEnabledSetting === "rotate-90") {
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
index fd46ec5164b..fd8687020cd 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/axis.ts
@@ -287,9 +287,9 @@ export const buildTimeSeriesDimensionAxis = (
...getCommonDimensionAxisOptions(chartLayout, settings, renderingContext),
type: "time",
axisLabel: {
- margin:
- CHART_STYLE.axisTicksMarginX +
- (hasTimelineEvents ? CHART_STYLE.timelineEvents.height : 0),
+ margin: hasTimelineEvents
+ ? CHART_STYLE.timelineEvents.height
+ : CHART_STYLE.axisTicksMarginX,
...getDimensionTicksDefaultOption(settings, renderingContext),
formatter: (rawValue: number) => {
const value = xAxisModel.fromEChartsAxisValue(rawValue);
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts
index 96083a50af6..9d4306473a0 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/index.ts
@@ -24,11 +24,6 @@ import {
buildMetricAxis,
} from "metabase/visualizations/echarts/cartesian/option/axis";
import { buildEChartsSeries } from "metabase/visualizations/echarts/cartesian/option/series";
-import {
- type SplitPanelYExtent,
- getTimelineEventsSeries,
-} from "metabase/visualizations/echarts/cartesian/timeline-events/option";
-import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
import type {
ComputedVisualizationSettings,
RenderingContext,
@@ -39,6 +34,9 @@ import { CHART_STYLE, Z_INDEXES } from "../constants/style";
import type { ChartLayout } from "../layout/types";
import { getDisplaySeriesSettingsByDataKey } from "../model/series";
import { getBarSeriesDataLabelKey } from "../model/util";
+import type { SplitPanelYExtent } from "../timeline-events/option";
+import { getTimelineEventsSelectionSeries } from "../timeline-events/option";
+import type { TimelineEventsModel } from "../timeline-events/types";
import { getGoalLineParams, getGoalLineSeriesOption } from "./goal-line";
import { getTrendLinesOption } from "./trend-line";
@@ -160,7 +158,7 @@ export function buildGridAndSeriesOption(
chartModel: BaseCartesianChartModel,
chartLayout: ChartLayout,
timelineEventsModel: TimelineEventsModel | null,
- selectedTimelineEventsIds: TimelineEventId[],
+ selectedTimelineEventIds: TimelineEventId[],
settings: ComputedVisualizationSettings,
renderingContext: RenderingContext,
dataSeriesOptions: EChartsSeriesOption[],
@@ -185,31 +183,20 @@ export function buildGridAndSeriesOption(
? remapTrendLinesToPanels(chartModel, visibleSeries)
: getTrendLinesOption(chartModel);
- const splitPanelYExtent = isSplitPanels
- ? getSplitPanelTimelineEventsYExtent(chartLayout, panelCount)
- : undefined;
-
- const timelineEventsSeries =
- timelineEventsModel != null
- ? getTimelineEventsSeries(
- timelineEventsModel,
- selectedTimelineEventsIds,
- renderingContext,
- splitPanelYExtent,
- )
- : null;
+ const timelineEventsSeries = getTimelineSelectionSeries(
+ timelineEventsModel,
+ selectedTimelineEventIds,
+ chartLayout,
+ panelCount,
+ isSplitPanels,
+ renderingContext,
+ );
const seriesOption = [
dataSeriesOptions,
goalSeriesOption,
trendSeriesOption,
- isSplitPanels && timelineEventsSeries
- ? {
- ...timelineEventsSeries,
- xAxisIndex: panelCount - 1,
- yAxisIndex: panelCount - 1,
- }
- : timelineEventsSeries,
+ timelineEventsSeries,
].flatMap((option) => option ?? []);
const grid: GridOption | GridOption[] = isSplitPanels
@@ -235,14 +222,14 @@ export function buildGridAndSeriesOption(
export const getCartesianChartOption = (
chartModel: CartesianChartModel,
chartLayout: ChartLayout,
+ hasTimelineEvents: boolean,
timelineEventsModel: TimelineEventsModel | null,
- selectedTimelineEventsIds: TimelineEventId[],
+ selectedTimelineEventIds: TimelineEventId[],
settings: ComputedVisualizationSettings,
chartWidth: number,
isAnimated: boolean,
renderingContext: RenderingContext,
): EChartsCoreOption => {
- const hasTimelineEvents = timelineEventsModel != null;
const isSplitPanels = chartLayout.panelHeight != null;
const dataSeriesOptions = buildEChartsSeries(
@@ -257,7 +244,7 @@ export const getCartesianChartOption = (
chartModel,
chartLayout,
timelineEventsModel,
- selectedTimelineEventsIds,
+ selectedTimelineEventIds,
settings,
renderingContext,
dataSeriesOptions,
@@ -327,6 +314,52 @@ export const getCartesianChartOption = (
};
};
+function getTimelineSelectionSeries(
+ timelineEventsModel: TimelineEventsModel | null,
+ selectedTimelineEventIds: TimelineEventId[],
+ chartLayout: ChartLayout,
+ panelCount: number,
+ isSplitPanels: boolean,
+ renderingContext: RenderingContext,
+): EChartsSeriesOption | null {
+ if (timelineEventsModel == null) {
+ return null;
+ }
+
+ const splitPanelYExtent = isSplitPanels
+ ? getSplitPanelTimelineEventsYExtent(chartLayout, panelCount)
+ : undefined;
+
+ const series = getTimelineEventsSelectionSeries(
+ timelineEventsModel,
+ selectedTimelineEventIds,
+ renderingContext,
+ splitPanelYExtent,
+ );
+
+ if (series == null) {
+ return null;
+ }
+
+ return isSplitPanels
+ ? { ...series, xAxisIndex: panelCount - 1, yAxisIndex: panelCount - 1 }
+ : series;
+}
+
+export function getSplitPanelTimelineEventsYExtent(
+ chartLayout: ChartLayout,
+ panelCount: number,
+): SplitPanelYExtent {
+ const panelHeight = chartLayout.panelHeight ?? 0;
+ return {
+ topY: chartLayout.padding.top,
+ bottomY:
+ chartLayout.padding.top +
+ (panelCount - 1) * (panelHeight + chartLayout.panelGap) +
+ panelHeight,
+ };
+}
+
export function buildSplitPanelGrid(
chartLayout: ChartLayout,
panelCount: number,
@@ -444,20 +477,6 @@ export function buildSplitPanelGoalSeries(
}));
}
-export function getSplitPanelTimelineEventsYExtent(
- chartLayout: ChartLayout,
- panelCount: number,
-): SplitPanelYExtent {
- const panelHeight = chartLayout.panelHeight ?? 0;
- return {
- topY: chartLayout.padding.top,
- bottomY:
- chartLayout.padding.top +
- (panelCount - 1) * (panelHeight + chartLayout.panelGap) +
- panelHeight,
- };
-}
-
export function buildSplitPanelYAxisLabel(
chartModel: BaseCartesianChartModel,
chartLayout: ChartLayout,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx b/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx
index fb7fa9220ef..82bacd54976 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/option/tooltip.tsx
@@ -7,10 +7,7 @@ import { getTooltipModel } from "metabase/visualizations/visualizations/Cartesia
import type { CardDisplayType } from "metabase-types/api";
import { getTooltipBaseOption } from "../../tooltip";
-import {
- GOAL_LINE_SERIES_ID,
- TIMELINE_EVENT_SERIES_ID,
-} from "../constants/dataset";
+import { GOAL_LINE_SERIES_ID } from "../constants/dataset";
import type { BaseCartesianChartModel, DataKey } from "../model/types";
interface ChartItemTooltip {
@@ -63,10 +60,7 @@ export const getTooltipOption = (
const { dataIndex, seriesId } = params;
- if (
- seriesId === TIMELINE_EVENT_SERIES_ID ||
- seriesId === GOAL_LINE_SERIES_ID
- ) {
+ if (seriesId === GOAL_LINE_SERIES_ID) {
return "";
}
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts
index 3298852303f..7467f7b4425 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/scatter/option/index.ts
@@ -27,14 +27,14 @@ import { buildEChartsScatterSeries } from "./series";
export function getScatterPlotOption(
chartModel: ScatterPlotModel,
chartLayout: ChartLayout,
+ hasTimelineEvents: boolean,
timelineEventsModel: TimelineEventsModel | null,
- selectedTimelineEventsIds: TimelineEventId[],
+ selectedTimelineEventIds: TimelineEventId[],
settings: ComputedVisualizationSettings,
chartWidth: number,
isAnimated: boolean,
renderingContext: RenderingContext,
): EChartsCoreOption {
- const hasTimelineEvents = timelineEventsModel != null;
const isSplitPanels = chartLayout.panelHeight != null;
const visibleSeries = chartModel.seriesModels.filter(
@@ -59,7 +59,7 @@ export function getScatterPlotOption(
chartModel,
chartLayout,
timelineEventsModel,
- selectedTimelineEventsIds,
+ selectedTimelineEventIds,
settings,
renderingContext,
dataSeriesOptions,
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.ts b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.ts
index 84087aed70f..72ed9f28a55 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.ts
@@ -10,7 +10,6 @@ import type {
TimeSeriesInterval,
} from "metabase/visualizations/echarts/cartesian/model/types";
import type { TimelineEventGroup } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
-import type { RenderingContext } from "metabase/visualizations/types";
import type { TimelineEvent } from "metabase-types/api";
import type { ChartLayout } from "../layout/types";
@@ -56,33 +55,10 @@ const groupEventsByUnitStart = (
}));
};
-const getMinDistanceFromTimelineEventGroup = (
- eventGroup: TimelineEventGroup,
- renderingContext: RenderingContext,
-) => {
- const eventsCount = eventGroup.events.length;
- if (eventsCount === 1) {
- return CHART_STYLE.timelineEvents.minDistance;
- }
-
- const countLabelWidth = renderingContext.measureText(eventsCount.toString(), {
- ...CHART_STYLE.axisTicks,
- size: renderingContext.theme.cartesian.label.fontSize,
- family: renderingContext.fontFamily,
- });
-
- return (
- CHART_STYLE.timelineEvents.minDistance +
- CHART_STYLE.timelineEvents.countLabelMargin +
- countLabelWidth
- );
-};
-
export const mergeOverlappingTimelineEventGroups = (
eventGroups: TimelineEventGroup[],
interval: TimeSeriesInterval,
intervalWidth: number,
- renderingContext: RenderingContext,
): TimelineEventGroup[] => {
const sortedGroups = [...eventGroups].sort((a, b) =>
dayjs.utc(a.date).isAfter(dayjs.utc(b.date)) ? 1 : -1,
@@ -107,12 +83,8 @@ export const mergeOverlappingTimelineEventGroups = (
const intervalsDiff =
currentGroupDate.diff(lastGroupDate, interval.unit) / interval.count;
const pixelDiff = intervalsDiff * intervalWidth;
- const lastGroupMinDistance = getMinDistanceFromTimelineEventGroup(
- lastGroup,
- renderingContext,
- );
- if (pixelDiff < lastGroupMinDistance) {
+ if (pixelDiff < CHART_STYLE.timelineEvents.minDistance) {
const combinedEvents = [...lastGroup.events, ...currentGroup.events];
mergedGroups[mergedGroups.length - 1] = {
date: lastGroup.date,
@@ -142,7 +114,6 @@ export const getTimelineEventsModel = (
chartModel: BaseCartesianChartModel,
chartLayout: ChartLayout,
timelineEvents: TimelineEvent[],
- renderingContext: RenderingContext,
) => {
if (timelineEvents.length === 0 || !isTimeSeriesAxis(chartModel.xAxisModel)) {
return null;
@@ -178,6 +149,5 @@ export const getTimelineEventsModel = (
timelineEventsByUnitStart,
chartModel.xAxisModel.interval,
intervalWidth,
- renderingContext,
);
};
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.unit.spec.ts
index 059f43c428e..25314378a43 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/model.unit.spec.ts
@@ -1,9 +1,8 @@
import type { TimeSeriesInterval } from "metabase/visualizations/echarts/cartesian/model/types";
-import type { TimelineEventGroup } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
-import type { RenderingContext } from "metabase/visualizations/types";
import { createMockTimelineEvent } from "metabase-types/api/mocks";
import { mergeOverlappingTimelineEventGroups } from "./model";
+import type { TimelineEventGroup } from "./types";
const createMockTimelineEventGroup = (
opts?: Partial<TimelineEventGroup>,
@@ -13,39 +12,6 @@ const createMockTimelineEventGroup = (
...opts,
});
-const createMockRenderingContext = (
- opts?: Partial<RenderingContext>,
-): RenderingContext => ({
- getColor: (colorName: string) => colorName,
- measureText: jest.fn().mockImplementation((text: string) => {
- const charWidth = 8;
- return text.length * charWidth;
- }),
- measureTextHeight: jest.fn().mockReturnValue(16),
- fontFamily: "Lato",
- theme: {
- cartesian: {
- label: {
- fontSize: 12,
- },
- goalLine: {
- label: {
- fontSize: 12,
- },
- },
- splitLine: {
- lineStyle: {
- color: "#E0E0E0",
- },
- },
- },
- pie: {
- borderColor: "#FFFFFF",
- },
- },
- ...opts,
-});
-
const createMockTimeSeriesInterval = (
opts?: Partial<TimeSeriesInterval>,
): TimeSeriesInterval => ({
@@ -54,9 +20,6 @@ const createMockTimeSeriesInterval = (
...opts,
});
-// eslint-disable-next-line testing-library/render-result-naming-convention
-const renderingContext = createMockRenderingContext();
-
describe("mergeOverlappingTimelineEventGroups", () => {
it("should not merge events that are far apart", () => {
const eventGroups: TimelineEventGroup[] = [
@@ -77,7 +40,6 @@ describe("mergeOverlappingTimelineEventGroups", () => {
eventGroups,
interval,
intervalWidth,
- renderingContext,
);
expect(result).toHaveLength(2);
@@ -104,7 +66,36 @@ describe("mergeOverlappingTimelineEventGroups", () => {
eventGroups,
interval,
intervalWidth,
- renderingContext,
+ );
+
+ expect(result).toHaveLength(1);
+ expect(result[0].events).toEqual([
+ ...eventGroups[0].events,
+ ...eventGroups[1].events,
+ ]);
+ });
+
+ it("should merge chips that would overlap given the wider chip width", () => {
+ const eventGroups: TimelineEventGroup[] = [
+ createMockTimelineEventGroup({
+ date: "2024-01-01T00:00:00Z",
+ events: [createMockTimelineEvent({ id: 1 })],
+ }),
+ createMockTimelineEventGroup({
+ date: "2024-01-01T00:00:30Z",
+ events: [createMockTimelineEvent({ id: 2 })],
+ }),
+ ];
+
+ const interval = createMockTimeSeriesInterval({ count: 1, unit: "minute" });
+ // 25px apart: wider than the old 16px threshold but still under a chip
+ // width, so the fixed-width chips would overlap and must merge.
+ const intervalWidth = 50; // 0.5 min * 50px = 25px
+
+ const result = mergeOverlappingTimelineEventGroups(
+ eventGroups,
+ interval,
+ intervalWidth,
);
expect(result).toHaveLength(1);
@@ -131,13 +122,12 @@ describe("mergeOverlappingTimelineEventGroups", () => {
];
const interval = createMockTimeSeriesInterval({ count: 5, unit: "minute" });
- const intervalWidth = 10; // 10px per 5-minute interval
+ const intervalWidth = 13; // 13px per 5-minute interval
const result = mergeOverlappingTimelineEventGroups(
eventGroups,
interval,
intervalWidth,
- renderingContext,
);
expect(result).toHaveLength(2);
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.ts b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.ts
index 750e687e07e..2f4019ae236 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.ts
@@ -1,140 +1,63 @@
import type { LineSeriesOption } from "echarts/charts";
import type { MarkLine2DDataItemOption } from "echarts/types/src/component/marker/MarkLineModel";
-import { Icons } from "metabase/ui/components/icons/Icon/icons";
import { CHART_STYLE } from "metabase/visualizations/echarts/cartesian/constants/style";
import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
import type { RenderingContext } from "metabase/visualizations/types";
-import type { IconName, TimelineEventId } from "metabase-types/api";
+import type { TimelineEventId } from "metabase-types/api";
-import {
- TIMELINE_EVENT_DATA_NAME,
- TIMELINE_EVENT_SERIES_ID,
-} from "../constants/dataset";
-
-// TODO: change to GraalVM supported implementation
-export const setSvgColor = (svgString: string, color: string) => {
- // Parse the SVG string into a DOM element
- const parser = new DOMParser();
- const doc = parser.parseFromString(svgString, "image/svg+xml");
- const svg = doc.documentElement;
-
- // Set the color attribute of the SVG
- svg.setAttribute("color", color);
-
- // Serialize the SVG back to a string
- const serializer = new XMLSerializer();
- return serializer.serializeToString(svg);
-};
-
-export function svgToDataUri(svgString: string) {
- const base64Encoded = btoa(svgString);
- return `data:image/svg+xml;base64,${base64Encoded}`;
-}
-
-function svgToImageUri(svgString: string) {
- return `image://${svgToDataUri(svgString)}`;
-}
+export const TIMELINE_EVENT_SELECTION_SERIES_ID = "timeline-event-selection";
export interface SplitPanelYExtent {
topY: number;
bottomY: number;
}
-export const getTimelineEventsSeries = (
+// Draws a vertical marker line for each selected timeline event
+export const getTimelineEventsSelectionSeries = (
timelineEventsModel: TimelineEventsModel,
- selectedEventsIds: TimelineEventId[],
- { fontFamily, getColor, theme }: RenderingContext,
+ selectedEventIds: TimelineEventId[],
+ { getColor }: RenderingContext,
splitPanelYExtent?: SplitPanelYExtent,
): LineSeriesOption | null => {
- const { fontSize } = theme?.cartesian?.label ?? {};
+ const selectedDates = timelineEventsModel
+ .filter(({ events }) =>
+ events.some((event) => selectedEventIds.includes(event.id)),
+ )
+ .map(({ date }) => date);
- if (timelineEventsModel.length === 0) {
+ if (selectedDates.length === 0) {
return null;
}
- const timelineEventsData = timelineEventsModel.map(({ date, events }) => {
- const isSelected = events.some((event) =>
- selectedEventsIds.includes(event.id),
- );
-
- const color = getColor(isSelected ? "core-brand" : "text-disabled");
- const iconName =
- events.length === 1 ? (events[0].icon as IconName) : "star";
-
- const iconSvg = setSvgColor(Icons[iconName].source, color);
- const dataUri = svgToImageUri(iconSvg);
-
- const itemProps = {
- name: TIMELINE_EVENT_DATA_NAME,
- symbolSize: 16,
- symbolOffset: [0, 12],
- symbolRotate: 0,
- symbol: dataUri,
- lineStyle: isSelected ? { color: getColor("core-brand") } : undefined,
- label: {
- show: events.length > 1,
- formatter: () => String(events.length),
- position: "start" as const,
- padding: [0, 0, 0, 24],
- hideOverlap: true,
- color,
- fontSize,
- fontWeight: CHART_STYLE.axisTicks.weight,
- fontFamily,
- },
- };
-
+ const markLineData = selectedDates.map((date) => {
if (splitPanelYExtent) {
- const markLineData: MarkLine2DDataItemOption = [
- { ...itemProps, xAxis: date, y: splitPanelYExtent.bottomY },
+ const data: MarkLine2DDataItemOption = [
+ { xAxis: date, y: splitPanelYExtent.bottomY },
{ xAxis: date, y: splitPanelYExtent.topY, symbol: "none" },
];
- return markLineData;
+ return data;
}
- return { ...itemProps, xAxis: date };
+ return { xAxis: date };
});
return {
- id: TIMELINE_EVENT_SERIES_ID,
+ id: TIMELINE_EVENT_SELECTION_SERIES_ID,
animation: false,
type: "line",
data: [],
markLine: {
- blur: {
- label: {
- opacity: 1,
- },
- itemStyle: {
- opacity: 1,
- },
- lineStyle: {
- opacity: 1,
- },
- },
- emphasis: {
- lineStyle: {
- color: getColor("core-brand"),
- },
- label: {
- color: getColor("core-brand"),
- },
- itemStyle: {
- color: getColor("core-brand"),
- },
- },
symbol: "none",
lineStyle: {
type: "solid",
- // eslint-disable-next-line metabase/no-color-literals
- color: "rgba(105, 110, 123, 0.2)",
- width: 2,
+ color: getColor("core-brand"),
+ width: CHART_STYLE.timelineEvents.selectionLineWidth,
},
label: {
show: false,
},
- data: timelineEventsData,
+ data: markLineData,
},
};
};
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.unit.spec.ts b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.unit.spec.ts
index 668c6144c8b..7eb110d1153 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/timeline-events/option.unit.spec.ts
@@ -1,11 +1,11 @@
-import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
import { DEFAULT_VISUALIZATION_THEME } from "metabase/visualizations/shared/utils/theme";
import type { RenderingContext } from "metabase/visualizations/types";
import { createMockTimelineEvent } from "metabase-types/api/mocks";
-import { getTimelineEventsSeries } from "./option";
+import { getTimelineEventsSelectionSeries } from "./option";
+import type { TimelineEventsModel } from "./types";
-const mockRenderingContext: RenderingContext = {
+const renderingContext: RenderingContext = {
getColor: (name) => name,
measureText: () => 0,
measureTextHeight: () => 0,
@@ -13,45 +13,67 @@ const mockRenderingContext: RenderingContext = {
theme: DEFAULT_VISUALIZATION_THEME,
};
-describe("getTimelineEventsSeries", () => {
- it("returns null when the model is empty", () => {
- const result = getTimelineEventsSeries([], [], mockRenderingContext);
- expect(result).toBeNull();
+const timelineEventsModel: TimelineEventsModel = [
+ {
+ date: "2025-01-01T00:00:00Z",
+ events: [createMockTimelineEvent({ id: 1 })],
+ },
+ {
+ date: "2025-02-01T00:00:00Z",
+ events: [
+ createMockTimelineEvent({ id: 2 }),
+ createMockTimelineEvent({ id: 3 }),
+ ],
+ },
+];
+
+describe("getTimelineEventsSelectionSeries", () => {
+ it("returns null when nothing is selected", () => {
+ expect(
+ getTimelineEventsSelectionSeries(
+ timelineEventsModel,
+ [],
+ renderingContext,
+ ),
+ ).toBeNull();
+ });
+
+ it("returns a markLine for each group containing a selected event", () => {
+ const series = getTimelineEventsSelectionSeries(
+ timelineEventsModel,
+ [3],
+ renderingContext,
+ );
+
+ expect(series?.markLine?.data).toEqual([{ xAxis: "2025-02-01T00:00:00Z" }]);
+ });
+
+ it("draws a line per selected date across distinct groups", () => {
+ const series = getTimelineEventsSelectionSeries(
+ timelineEventsModel,
+ [1, 2],
+ renderingContext,
+ );
+
+ expect(series?.markLine?.data).toEqual([
+ { xAxis: "2025-01-01T00:00:00Z" },
+ { xAxis: "2025-02-01T00:00:00Z" },
+ ]);
});
- it("positions the label at the bottom of the split panel (bottomY first, topY second) #74005", () => {
- const timelineEventsModel: TimelineEventsModel = [
- {
- date: "2027-10-01T00:00:00Z",
- events: [
- createMockTimelineEvent({ id: 1, name: "RC1" }),
- createMockTimelineEvent({ id: 2, name: "RC2" }),
- ],
- },
- ];
-
- const result = getTimelineEventsSeries(
+ it("uses two-point segments spanning the panel extent for split panels", () => {
+ const series = getTimelineEventsSelectionSeries(
timelineEventsModel,
- [],
- mockRenderingContext,
- { topY: 0, bottomY: 300 },
+ [1],
+ renderingContext,
+ { topY: 10, bottomY: 200 },
);
- expect(result).not.toBeNull();
- const markLineData = result!.markLine!.data as unknown[][];
- expect(markLineData).toHaveLength(1);
-
- const [startPoint, endPoint] = markLineData[0] as Array<{
- y: number;
- xAxis: string;
- symbol: string;
- }>;
-
- expect(startPoint.y).toBe(300);
- expect(startPoint.xAxis).toBe("2027-10-01T00:00:00Z");
- expect(startPoint.symbol).not.toBe("none");
- expect(endPoint.y).toBe(0);
- expect(endPoint.xAxis).toBe("2027-10-01T00:00:00Z");
- expect(endPoint.symbol).toBe("none");
+ expect(series?.markLine?.data).toEqual([
+ [
+ { xAxis: "2025-01-01T00:00:00Z", y: 200 },
+ { xAxis: "2025-01-01T00:00:00Z", y: 10, symbol: "none" },
+ ],
+ ]);
});
});
diff --git a/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts b/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts
index 9eafb687c74..0567bc7fb7e 100644
--- a/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts
+++ b/frontend/src/metabase/visualizations/echarts/cartesian/waterfall/option/index.ts
@@ -39,7 +39,7 @@ import {
getGoalLineParams,
getGoalLineSeriesOption,
} from "../../option/goal-line";
-import { getTimelineEventsSeries } from "../../timeline-events/option";
+import { getTimelineEventsSelectionSeries } from "../../timeline-events/option";
import type { TimelineEventsModel } from "../../timeline-events/types";
const getLabelLayoutFn = (
@@ -215,21 +215,13 @@ export const getWaterfallChartOption = (
chartModel: WaterfallChartModel,
chartWidth: number,
chartLayout: ChartLayout,
+ hasTimelineEvents: boolean,
timelineEventsModel: TimelineEventsModel | null,
- selectedTimelineEventsIds: TimelineEventId[],
+ selectedTimelineEventIds: TimelineEventId[],
settings: ComputedVisualizationSettings,
isAnimated: boolean,
renderingContext: RenderingContext,
): EChartsCoreOption => {
- const hasTimelineEvents = timelineEventsModel != null;
- const timelineEventsSeries = hasTimelineEvents
- ? getTimelineEventsSeries(
- timelineEventsModel,
- selectedTimelineEventsIds,
- renderingContext,
- )
- : null;
-
const dataSeriesOptions = buildEChartsWaterfallSeries(
chartModel,
settings,
@@ -244,6 +236,15 @@ export const getWaterfallChartOption = (
renderingContext,
);
+ const timelineEventsSeries =
+ timelineEventsModel != null
+ ? getTimelineEventsSelectionSeries(
+ timelineEventsModel,
+ selectedTimelineEventIds,
+ renderingContext,
+ )
+ : null;
+
const seriesOption: WaterfallSeriesOption[] = [
dataSeriesOptions,
goalSeriesOption,
diff --git a/frontend/src/metabase/visualizations/types/hover.ts b/frontend/src/metabase/visualizations/types/hover.ts
index 6901222caf1..cf86fff7d29 100644
--- a/frontend/src/metabase/visualizations/types/hover.ts
+++ b/frontend/src/metabase/visualizations/types/hover.ts
@@ -1,5 +1,5 @@
import type { ClickObjectDataRow } from "metabase-lib";
-import type { RowValue, TimelineEvent } from "metabase-types/api";
+import type { RowValue } from "metabase-types/api";
import type { RemappingHydratedDatasetColumn } from "./columns";
import type { ComputedVisualizationSettings } from "./visualization";
@@ -13,11 +13,6 @@ export interface HoveredDimension {
column: RemappingHydratedDatasetColumn;
}
-export interface HoveredTimelineEvent {
- timelineEvents: TimelineEvent[];
- element: Element;
-}
-
export interface TooltipRowModel {
color?: string;
name: string;
@@ -42,7 +37,6 @@ export interface HoveredObject {
datumIndex?: number;
value?: unknown;
column?: RemappingHydratedDatasetColumn;
- timelineEvents?: TimelineEvent[];
data?: DataPoint[];
footerData?: DataPoint[];
dimensions?: HoveredDimension[];
diff --git a/frontend/src/metabase/visualizations/types/visualization.ts b/frontend/src/metabase/visualizations/types/visualization.ts
index 0913fff7243..49dce7d3a17 100644
--- a/frontend/src/metabase/visualizations/types/visualization.ts
+++ b/frontend/src/metabase/visualizations/types/visualization.ts
@@ -205,7 +205,7 @@ export interface VisualizationProps {
) => void;
onSelectTimelineEvents?: (timelineEvents: TimelineEvent[]) => void;
onDeselectTimelineEvents?: () => void;
- onOpenTimelines?: () => void;
+ onOpenTimelines?: (eventIds?: number[]) => void;
canToggleSeriesVisibility?: boolean;
onUpdateWarnings?: any;
@@ -228,7 +228,7 @@ export type VisualizationPassThroughProps = {
zoomedRowIndex?: number;
onZoomRow?: (rowIndex: number) => void;
onDeselectTimelineEvents?: () => void;
- onOpenTimelines?: () => void;
+ onOpenTimelines?: (eventIds?: number[]) => void;
onSelectTimelineEvents?: (timelineEvents: TimelineEvent[]) => void;
// Table
diff --git a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
index 5e3b55f5ed9..640741247fb 100644
--- a/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/BoxPlot/BoxPlot.tsx
@@ -156,8 +156,6 @@ function BoxPlotInner({
...getBoxPlotOption(
chartModel,
layoutModel,
- null,
- [],
settings,
shouldAnimate,
renderingContext,
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
index 4af06e3e796..157dec491db 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/CartesianChart.tsx
@@ -20,6 +20,7 @@ import {
} from "metabase/visualizations/visualizations/CartesianChart/CartesianChart.styled";
import { useChartEvents } from "metabase/visualizations/visualizations/CartesianChart/use-chart-events";
+import { TimelineEventsBand } from "./TimelineEventsBand";
import { useChartDebug } from "./use-chart-debug";
import { useModelsAndOption } from "./use-models-and-option";
import { getDashboardAdjustedSettings } from "./utils";
@@ -56,6 +57,10 @@ function CartesianChartInner(props: VisualizationProps) {
onHoverChange,
canToggleSeriesVisibility,
titleMenuItems,
+ onOpenTimelines,
+ onSelectTimelineEvents,
+ onDeselectTimelineEvents,
+ selectedTimelineEventIds,
} = props;
const settings = useMemo(
@@ -70,17 +75,22 @@ function CartesianChartInner(props: VisualizationProps) {
[originalSettings, outerHeight, outerWidth, autoAdjustSettings],
);
- const { chartModel, timelineEventsModel, option, renderingContext } =
- useModelsAndOption(
- {
- ...props,
- width: chartSize.width,
- height: chartSize.height,
- hiddenSeries,
- settings,
- },
- containerRef,
- );
+ const {
+ chartModel,
+ chartLayout,
+ timelineEventsModel,
+ option,
+ renderingContext,
+ } = useModelsAndOption(
+ {
+ ...props,
+ width: chartSize.width,
+ height: chartSize.height,
+ hiddenSeries,
+ settings,
+ },
+ containerRef,
+ );
useChartDebug({ isQueryBuilder, rawSeries, option, chartModel });
const chartRef = useRef<EChartsType>();
@@ -131,7 +141,6 @@ function CartesianChartInner(props: VisualizationProps) {
chartRef,
containerRef,
chartModel,
- timelineEventsModel,
option,
renderingContext,
props,
@@ -142,6 +151,11 @@ function CartesianChartInner(props: VisualizationProps) {
setChartSize({ width, height });
}, []);
+ const timelineEventsXAxisIndex =
+ chartLayout.panelHeight != null
+ ? chartModel.seriesModels.filter((series) => series.visible).length - 1
+ : 0;
+
// We can't navigate a user to a particular card from a visualizer viz,
// so title selection is disabled in this case
const canSelectTitle =
@@ -205,6 +219,17 @@ function CartesianChartInner(props: VisualizationProps) {
chartModel={chartModel}
settings={settings}
/>
+ <TimelineEventsBand
+ chartInstance={chartInstance}
+ chartSize={chartSize}
+ timelineEventsModel={timelineEventsModel}
+ chartLayout={chartLayout}
+ xAxisIndex={timelineEventsXAxisIndex}
+ selectedTimelineEventIds={selectedTimelineEventIds}
+ onOpenTimelines={onOpenTimelines}
+ onSelectTimelineEvents={onSelectTimelineEvents}
+ onDeselectTimelineEvents={onDeselectTimelineEvents}
+ />
</ResponsiveEChartsRenderer>
</CartesianChartLegendLayout>
{seriesColorsCss}
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventChip.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventChip.tsx
new file mode 100644
index 00000000000..9421301b46d
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventChip.tsx
@@ -0,0 +1,127 @@
+import cx from "classnames";
+import { t } from "ttag";
+
+import { Box, HoverCard, Icon, Text, UnstyledButton } from "metabase/ui";
+import { TIMELINE_EVENTS_BAND } from "metabase/visualizations/echarts/cartesian/constants/style";
+import type { TimelineEvent, TimelineEventId } from "metabase-types/api";
+
+import S from "./TimelineEventsBand.module.css";
+import { TimelineEventRow, TimelineEventsList } from "./TimelineEventsList";
+import {
+ type PositionedTimelineEventGroup,
+ getTimelineEventGroupIconName,
+} from "./utils";
+
+const MAX_VISIBLE_EVENTS = 3;
+
+const AXIS_CLEARANCE = 8;
+const POPOVER_OFFSET =
+ TIMELINE_EVENTS_BAND.marginY +
+ TIMELINE_EVENTS_BAND.bandPaddingY +
+ AXIS_CLEARANCE;
+
+interface TimelineEventChipProps {
+ eventsGroup: PositionedTimelineEventGroup;
+ centerY: number;
+ selectedEventIds: TimelineEventId[];
+ onOpenTimelines?: (eventIds?: number[]) => void;
+ onSelectTimelineEvents?: (events: TimelineEvent[]) => void;
+ onDeselectTimelineEvents?: () => void;
+}
+
+export const TimelineEventChip = ({
+ eventsGroup,
+ centerY,
+ selectedEventIds,
+ onOpenTimelines,
+ onSelectTimelineEvents,
+ onDeselectTimelineEvents,
+}: TimelineEventChipProps) => {
+ const { group, x } = eventsGroup;
+ const { events } = group;
+
+ const isSingleEvent = events.length === 1;
+ const hasMoreThanMax = events.length > MAX_VISIBLE_EVENTS;
+ const visibleEvents = hasMoreThanMax
+ ? events.slice(0, MAX_VISIBLE_EVENTS)
+ : events;
+
+ const isSelected = events.some((event) =>
+ selectedEventIds.includes(event.id),
+ );
+ const areAllEventsSelected = events.every((event) =>
+ selectedEventIds.includes(event.id),
+ );
+
+ const canSelect = onSelectTimelineEvents != null;
+ const handleSelect = () => {
+ onOpenTimelines?.(isSingleEvent ? undefined : events.map((e) => e.id));
+ onSelectTimelineEvents?.(events);
+ };
+
+ const handleChipClick = () => {
+ if (areAllEventsSelected) {
+ onDeselectTimelineEvents?.();
+ onOpenTimelines?.();
+ } else {
+ handleSelect();
+ }
+ };
+
+ const showSeeAll = hasMoreThanMax && canSelect;
+
+ return (
+ <HoverCard
+ position="top"
+ offset={POPOVER_OFFSET}
+ openDelay={50}
+ closeDelay={150}
+ shadow="md"
+ classNames={{ dropdown: S.bridgeDropdown }}
+ >
+ <HoverCard.Target>
+ <UnstyledButton
+ className={cx(S.chip, isSelected && S.chipSelected)}
+ style={{ left: x, top: centerY }}
+ data-testid="timeline-event-chip"
+ data-selected={isSelected}
+ aria-label={
+ isSingleEvent ? events[0].name : t`${events.length} events`
+ }
+ onClick={canSelect ? handleChipClick : undefined}
+ >
+ {isSingleEvent ? (
+ <Icon name={getTimelineEventGroupIconName(group)} size={12} />
+ ) : (
+ <Text component="span" size="xs" fw="bold" lh={1}>
+ {events.length}
+ </Text>
+ )}
+ </UnstyledButton>
+ </HoverCard.Target>
+ <HoverCard.Dropdown p={0} bdrs="0.75rem">
+ <div data-testid="timeline-event-popover">
+ {isSingleEvent ? (
+ <Box miw="8rem" maw="16rem" p="0.75rem">
+ <TimelineEventRow event={events[0]} showIcon={false} />
+ </Box>
+ ) : (
+ <>
+ <Box w="16rem">
+ <TimelineEventsList events={visibleEvents} />
+ </Box>
+ {showSeeAll && (
+ <UnstyledButton
+ className={S.seeAllButton}
+ onClick={handleSelect}
+ >
+ {t`See all`}
+ </UnstyledButton>
+ )}
+ </>
+ )}
+ </div>
+ </HoverCard.Dropdown>
+ </HoverCard>
+ );
+};
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventChip.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventChip.unit.spec.tsx
new file mode 100644
index 00000000000..5e5fb9f5f8e
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventChip.unit.spec.tsx
@@ -0,0 +1,193 @@
+import userEvent from "@testing-library/user-event";
+
+import { renderWithProviders, screen } from "__support__/ui";
+import type { TimelineEventId } from "metabase-types/api";
+import { createMockTimelineEvent } from "metabase-types/api/mocks";
+
+import { TimelineEventChip } from "./TimelineEventChip";
+import type { PositionedTimelineEventGroup } from "./utils";
+
+const singleGroup: PositionedTimelineEventGroup = {
+ group: {
+ date: "2025-01-01T00:00:00Z",
+ events: [
+ createMockTimelineEvent({ id: 1, name: "Release v1", icon: "cloud" }),
+ ],
+ },
+ x: 100,
+};
+
+const twoGroup: PositionedTimelineEventGroup = {
+ group: {
+ date: "2025-02-01T00:00:00Z",
+ events: [
+ createMockTimelineEvent({ id: 2, name: "Event A" }),
+ createMockTimelineEvent({ id: 3, name: "Event B" }),
+ ],
+ },
+ x: 200,
+};
+
+const manyGroup: PositionedTimelineEventGroup = {
+ group: {
+ date: "2025-03-01T00:00:00Z",
+ events: [
+ createMockTimelineEvent({ id: 4, name: "Many 1" }),
+ createMockTimelineEvent({ id: 5, name: "Many 2" }),
+ createMockTimelineEvent({ id: 6, name: "Many 3" }),
+ createMockTimelineEvent({ id: 7, name: "Many 4" }),
+ ],
+ },
+ x: 300,
+};
+
+interface SetupOpts {
+ eventsGroup?: PositionedTimelineEventGroup;
+ selectedEventIds?: TimelineEventId[];
+ withCallbacks?: boolean;
+}
+
+const setup = ({
+ eventsGroup = singleGroup,
+ selectedEventIds = [],
+ withCallbacks = true,
+}: SetupOpts = {}) => {
+ const onOpenTimelines = jest.fn();
+ const onSelectTimelineEvents = jest.fn();
+ const onDeselectTimelineEvents = jest.fn();
+
+ renderWithProviders(
+ <TimelineEventChip
+ eventsGroup={eventsGroup}
+ centerY={120}
+ selectedEventIds={selectedEventIds}
+ onOpenTimelines={withCallbacks ? onOpenTimelines : undefined}
+ onSelectTimelineEvents={
+ withCallbacks ? onSelectTimelineEvents : undefined
+ }
+ onDeselectTimelineEvents={
+ withCallbacks ? onDeselectTimelineEvents : undefined
+ }
+ />,
+ );
+
+ return { onOpenTimelines, onSelectTimelineEvents, onDeselectTimelineEvents };
+};
+
+describe("TimelineEventChip", () => {
+ it("renders the event count for a cluster", () => {
+ setup({ eventsGroup: manyGroup });
+ expect(screen.getByTestId("timeline-event-chip")).toHaveTextContent("4");
+ });
+
+ it("marks the chip as selected when one of its events is selected", () => {
+ setup({ eventsGroup: singleGroup, selectedEventIds: [1] });
+ expect(screen.getByTestId("timeline-event-chip")).toHaveAttribute(
+ "data-selected",
+ "true",
+ );
+ });
+
+ it("opens a single-event popover on hover without a 'See all' link", async () => {
+ setup({ eventsGroup: singleGroup });
+
+ await userEvent.hover(screen.getByTestId("timeline-event-chip"));
+
+ expect(await screen.findByText("Release v1")).toBeInTheDocument();
+ expect(screen.queryByText("See all")).not.toBeInTheDocument();
+ });
+
+ it("lists all events on hover for a small cluster", async () => {
+ setup({ eventsGroup: twoGroup });
+
+ await userEvent.hover(screen.getByTestId("timeline-event-chip"));
+
+ expect(await screen.findByText("Event A")).toBeInTheDocument();
+ expect(screen.getByText("Event B")).toBeInTheDocument();
+ expect(screen.queryByText("See all")).not.toBeInTheDocument();
+ });
+
+ it("truncates to three events and shows 'See all' for more than three", async () => {
+ setup({ eventsGroup: manyGroup });
+
+ await userEvent.hover(screen.getByTestId("timeline-event-chip"));
+
+ expect(await screen.findByText("Many 1")).toBeInTheDocument();
+ expect(screen.getByText("Many 3")).toBeInTheDocument();
+ expect(screen.queryByText("Many 4")).not.toBeInTheDocument();
+ expect(screen.getByText("See all")).toBeInTheDocument();
+ });
+
+ it("opens the full sidebar (no focus) and selects the event when a single chip is clicked", async () => {
+ const { onOpenTimelines, onSelectTimelineEvents } = setup({
+ eventsGroup: singleGroup,
+ });
+
+ await userEvent.click(screen.getByTestId("timeline-event-chip"));
+
+ expect(onOpenTimelines).toHaveBeenCalledWith(undefined);
+ expect(onSelectTimelineEvents).toHaveBeenCalledWith(
+ singleGroup.group.events,
+ );
+ });
+
+ it("deselects the events when a fully selected chip is clicked", async () => {
+ const {
+ onSelectTimelineEvents,
+ onDeselectTimelineEvents,
+ onOpenTimelines,
+ } = setup({ eventsGroup: twoGroup, selectedEventIds: [2, 3] });
+
+ await userEvent.click(screen.getByTestId("timeline-event-chip"));
+
+ expect(onDeselectTimelineEvents).toHaveBeenCalled();
+ expect(onSelectTimelineEvents).not.toHaveBeenCalled();
+ // clears any sidebar focus so the full list returns
+ expect(onOpenTimelines).toHaveBeenCalledWith();
+ });
+
+ it("selects the whole group when a partially selected cluster is clicked", async () => {
+ const { onSelectTimelineEvents, onDeselectTimelineEvents } = setup({
+ eventsGroup: twoGroup,
+ selectedEventIds: [2],
+ });
+
+ await userEvent.click(screen.getByTestId("timeline-event-chip"));
+
+ expect(onSelectTimelineEvents).toHaveBeenCalledWith(twoGroup.group.events);
+ expect(onDeselectTimelineEvents).not.toHaveBeenCalled();
+ });
+
+ it("focuses the sidebar on the group and selects its events when a grouped chip is clicked", async () => {
+ const { onOpenTimelines, onSelectTimelineEvents } = setup({
+ eventsGroup: twoGroup,
+ });
+
+ await userEvent.click(screen.getByTestId("timeline-event-chip"));
+
+ expect(onOpenTimelines).toHaveBeenCalledWith([2, 3]);
+ expect(onSelectTimelineEvents).toHaveBeenCalledWith(twoGroup.group.events);
+ });
+
+ it("focuses the sidebar on the group and selects its events from 'See all'", async () => {
+ const { onOpenTimelines, onSelectTimelineEvents } = setup({
+ eventsGroup: manyGroup,
+ });
+
+ await userEvent.hover(screen.getByTestId("timeline-event-chip"));
+ await userEvent.click(await screen.findByText("See all"));
+
+ expect(onOpenTimelines).toHaveBeenCalledWith([4, 5, 6, 7]);
+ expect(onSelectTimelineEvents).toHaveBeenCalledWith(manyGroup.group.events);
+ });
+
+ it("hides 'See all' and does not select in degraded contexts", async () => {
+ setup({ eventsGroup: manyGroup, withCallbacks: false });
+
+ await userEvent.click(screen.getByTestId("timeline-event-chip"));
+ await userEvent.hover(screen.getByTestId("timeline-event-chip"));
+
+ expect(await screen.findByText("Many 1")).toBeInTheDocument();
+ expect(screen.queryByText("See all")).not.toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.module.css b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.module.css
new file mode 100644
index 00000000000..5713c0d2e36
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.module.css
@@ -0,0 +1,94 @@
+.track {
+ position: absolute;
+ display: flex;
+ align-items: center;
+ border-radius: var(--mantine-radius-md);
+ background-color: var(--mb-color-background_page-secondary);
+ pointer-events: none;
+ padding: 0.25rem 0;
+}
+
+/*
+ * The hover popover is offset above the chip so it clears the x-axis line,
+ * which leaves a dead gap between the chip and the dropdown. This transparent
+ * bridge below the dropdown fills that gap so moving the cursor from the chip
+ * into the popover keeps it open. Its height must cover the popover offset.
+ */
+.bridgeDropdown::after {
+ content: "";
+ position: absolute;
+ top: 100%;
+ left: 0;
+ right: 0;
+ height: 1.5rem;
+}
+
+/*
+ * The bridge extends past the dropdown, so keep overflow visible — otherwise the
+ * default `overflow: auto` treats the bridge as content and adds a scrollbar.
+ * The doubled selector wins over the default dropdown styles. The content always
+ * fits (at most three rows plus "See all"), so no scrolling is needed.
+ */
+.bridgeDropdown.bridgeDropdown {
+ overflow: visible;
+}
+
+.chip {
+ position: absolute;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-sizing: border-box;
+ width: 2rem;
+ height: 1.5rem;
+ padding: 0;
+ border: 1px solid var(--mb-color-border);
+ border-radius: 0.75rem;
+ background-color: var(--mb-color-background_surface-primary);
+ color: var(--mb-color-icon-primary);
+ cursor: pointer;
+ pointer-events: all;
+ transform: translate(-50%, -50%);
+}
+
+.chip:hover {
+ background-color: var(--mb-color-background_surface-primary-hover);
+}
+
+.chipSelected {
+ color: var(--mb-color-text-brand);
+ border-color: var(--mb-color-text-brand);
+}
+
+.listItemWrapper {
+ padding: 0.75rem;
+
+ &:not(:last-child) {
+ border-bottom: 1px solid var(--mb-color-border-neutral-subtle);
+ }
+}
+
+.eventDate {
+ font-size: var(--mantine-font-size-sm);
+ color: var(--mb-color-text-secondary);
+}
+
+.seeAllButton {
+ display: block;
+ width: 100%;
+ padding: 0.75rem 1rem;
+ text-align: center;
+ font-weight: bold;
+ color: var(--mb-color-text-brand);
+ background-color: transparent;
+ border: none;
+ border-top: 1px solid var(--mb-color-border-neutral-subtle);
+
+ /* Match the dropdown's rounded corners */
+ border-bottom-left-radius: var(--mantine-radius-lg);
+ border-bottom-right-radius: var(--mantine-radius-lg);
+}
+
+.seeAllButton:hover {
+ background-color: var(--mb-color-background_surface-brand-subtle);
+}
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.tsx
new file mode 100644
index 00000000000..f20c36101d2
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.tsx
@@ -0,0 +1,124 @@
+import type { EChartsType } from "echarts/core";
+import { useCallback, useEffect, useState } from "react";
+
+import {
+ TIMELINE_BAND_HEIGHT,
+ TIMELINE_EVENTS_BAND,
+} from "metabase/visualizations/echarts/cartesian/constants/style";
+import type { ChartLayout } from "metabase/visualizations/echarts/cartesian/layout/types";
+import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
+import type { TimelineEvent, TimelineEventId } from "metabase-types/api";
+
+import { TimelineEventChip } from "./TimelineEventChip";
+import S from "./TimelineEventsBand.module.css";
+import {
+ type PositionedTimelineEventGroup,
+ arePositionedGroupsEqual,
+ getPositionedTimelineEventGroups,
+} from "./utils";
+
+interface TimelineEventsBandProps {
+ chartInstance?: EChartsType;
+ chartSize: { width: number; height: number };
+ timelineEventsModel: TimelineEventsModel | null;
+ chartLayout: ChartLayout;
+ xAxisIndex: number;
+ selectedTimelineEventIds?: TimelineEventId[];
+ onOpenTimelines?: (eventIds?: number[]) => void;
+ onSelectTimelineEvents?: (events: TimelineEvent[]) => void;
+ onDeselectTimelineEvents?: () => void;
+}
+
+export const TimelineEventsBand = ({
+ chartInstance,
+ chartSize,
+ timelineEventsModel,
+ chartLayout,
+ xAxisIndex,
+ selectedTimelineEventIds,
+ onOpenTimelines,
+ onSelectTimelineEvents,
+ onDeselectTimelineEvents,
+}: TimelineEventsBandProps) => {
+ const gridBottom = chartSize.height - chartLayout.padding.bottom;
+ const trackTop = gridBottom + TIMELINE_EVENTS_BAND.marginY;
+ const centerY = trackTop + TIMELINE_BAND_HEIGHT / 2;
+
+ const plotLeft = chartLayout.padding.left;
+ const plotRight = chartSize.width - chartLayout.padding.right;
+
+ const [positionedGroups, setPositionedGroups] = useState<
+ PositionedTimelineEventGroup[]
+ >([]);
+
+ const updatePositionedGroups = useCallback(() => {
+ const canPosition =
+ chartInstance != null &&
+ timelineEventsModel != null &&
+ timelineEventsModel.length > 0 &&
+ chartSize.width > 0;
+
+ const next = canPosition
+ ? getPositionedTimelineEventGroups({
+ timelineEventsModel,
+ chartInstance,
+ plotBounds: { left: plotLeft, right: plotRight },
+ xAxisIndex,
+ })
+ : [];
+
+ setPositionedGroups((previous) =>
+ arePositionedGroupsEqual(previous, next) ? previous : next,
+ );
+ }, [
+ chartInstance,
+ timelineEventsModel,
+ plotLeft,
+ plotRight,
+ xAxisIndex,
+ chartSize.width,
+ ]);
+
+ useEffect(() => {
+ updatePositionedGroups();
+ }, [updatePositionedGroups]);
+
+ useEffect(() => {
+ if (!chartInstance) {
+ return;
+ }
+ chartInstance.on("finished", updatePositionedGroups);
+ return () => {
+ chartInstance.off("finished", updatePositionedGroups);
+ };
+ }, [chartInstance, updatePositionedGroups]);
+
+ if (positionedGroups.length === 0) {
+ return null;
+ }
+
+ return (
+ <div data-testid="timeline-events-band">
+ <div
+ className={S.track}
+ style={{
+ left: plotLeft,
+ width: plotRight - plotLeft,
+ top: trackTop,
+ height: TIMELINE_BAND_HEIGHT,
+ }}
+ />
+ {positionedGroups.map((eventsGroup) => (
+ <TimelineEventChip
+ key={eventsGroup.group.date}
+ eventsGroup={eventsGroup}
+ centerY={centerY}
+ selectedEventIds={selectedTimelineEventIds ?? []}
+ onOpenTimelines={onOpenTimelines}
+ onSelectTimelineEvents={onSelectTimelineEvents}
+ onDeselectTimelineEvents={onDeselectTimelineEvents}
+ />
+ ))}
+ </div>
+ );
+};
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.unit.spec.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.unit.spec.tsx
new file mode 100644
index 00000000000..feeb0f7a558
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsBand.unit.spec.tsx
@@ -0,0 +1,106 @@
+import type { EChartsType } from "echarts/core";
+
+import { renderWithProviders, screen } from "__support__/ui";
+import type { ChartLayout } from "metabase/visualizations/echarts/cartesian/layout/types";
+import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
+import { createMockTimelineEvent } from "metabase-types/api/mocks";
+
+import { TimelineEventsBand } from "./TimelineEventsBand";
+
+const createChartLayout = (): ChartLayout => ({
+ padding: { top: 10, left: 50, bottom: 40, right: 10 },
+ bounds: { top: 10, left: 50, bottom: 160, right: 450 },
+ boundaryWidth: 400,
+ outerWidth: 500,
+ outerHeight: 200,
+ axisEnabledSetting: true,
+ panelGap: 0,
+ ticksDimensions: {
+ yTicksWidthLeft: 0,
+ yTicksWidthRight: 0,
+ xTicksHeight: 40,
+ firstXTickWidth: 0,
+ lastXTickWidth: 0,
+ getXTickWidth: () => 0,
+ },
+});
+
+const createChartInstance = (
+ pixelByDate: Record<string, number>,
+): EChartsType =>
+ ({
+ convertToPixel: (_finder: unknown, value: string) =>
+ pixelByDate[value] ?? NaN,
+ on: jest.fn(),
+ off: jest.fn(),
+ }) as unknown as EChartsType;
+
+const timelineEventsModel: TimelineEventsModel = [
+ {
+ date: "2025-01-01T00:00:00Z",
+ events: [createMockTimelineEvent({ id: 1, name: "First" })],
+ },
+ {
+ date: "2025-02-01T00:00:00Z",
+ events: [createMockTimelineEvent({ id: 2, name: "Second" })],
+ },
+];
+
+interface SetupOpts {
+ chartInstance?: EChartsType;
+ timelineEventsModel?: TimelineEventsModel | null;
+ selectedTimelineEventIds?: number[];
+}
+
+const setup = (opts: SetupOpts = {}) => {
+ const { timelineEventsModel: model = timelineEventsModel } = opts;
+ // Using `in` so an explicit `chartInstance: undefined` is honored rather than
+ // falling back to the default (a destructuring default would override it).
+ const chartInstance =
+ "chartInstance" in opts
+ ? opts.chartInstance
+ : createChartInstance({
+ "2025-01-01T00:00:00Z": 120,
+ "2025-02-01T00:00:00Z": 300,
+ });
+
+ renderWithProviders(
+ <TimelineEventsBand
+ chartInstance={chartInstance}
+ chartSize={{ width: 500, height: 200 }}
+ timelineEventsModel={model}
+ chartLayout={createChartLayout()}
+ xAxisIndex={0}
+ selectedTimelineEventIds={opts.selectedTimelineEventIds}
+ />,
+ );
+};
+
+describe("TimelineEventsBand", () => {
+ it("renders a chip per visible event group", () => {
+ setup();
+ expect(screen.getByTestId("timeline-events-band")).toBeInTheDocument();
+ expect(screen.getAllByTestId("timeline-event-chip")).toHaveLength(2);
+ });
+
+ it("marks the chip for a selected event group as selected", () => {
+ setup({ selectedTimelineEventIds: [2] });
+ const chips = screen.getAllByTestId("timeline-event-chip");
+ expect(chips[0]).toHaveAttribute("data-selected", "false");
+ expect(chips[1]).toHaveAttribute("data-selected", "true");
+ });
+
+ it("renders nothing without a chart instance", () => {
+ setup({ chartInstance: undefined });
+ expect(
+ screen.queryByTestId("timeline-events-band"),
+ ).not.toBeInTheDocument();
+ });
+
+ it("renders nothing without a timeline events model", () => {
+ setup({ timelineEventsModel: null });
+ expect(
+ screen.queryByTestId("timeline-events-band"),
+ ).not.toBeInTheDocument();
+ });
+});
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsList.tsx b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsList.tsx
new file mode 100644
index 00000000000..74314da42ea
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/TimelineEventsList.tsx
@@ -0,0 +1,52 @@
+import { DateTime } from "metabase/common/components/DateTime";
+import { Box, Flex, Icon, Stack, Text } from "metabase/ui";
+import type { TimelineEvent } from "metabase-types/api";
+
+import S from "./TimelineEventsBand.module.css";
+import { TIMELINE_ICON_TO_SMALL_ICON_MAP } from "./utils";
+
+interface TimelineEventRowProps {
+ event: TimelineEvent;
+ showIcon?: boolean;
+}
+
+export const TimelineEventRow = ({
+ event,
+ showIcon = true,
+}: TimelineEventRowProps) => (
+ <Flex gap="sm" align="flex-start">
+ {showIcon && (
+ <Icon
+ name={TIMELINE_ICON_TO_SMALL_ICON_MAP[event.icon]}
+ c="icon-disabled"
+ mt="0.125rem"
+ size={12}
+ flex="0 0 auto"
+ />
+ )}
+ <Stack gap={2}>
+ <Text component="span" c="text-primary" size="sm" lh="1rem" fw="bold">
+ {event.name}
+ </Text>
+ <DateTime
+ className={S.eventDate}
+ value={event.timestamp}
+ unit={event.time_matters ? "default" : "day"}
+ />
+ </Stack>
+ </Flex>
+);
+
+interface TimelineEventsListProps {
+ events: TimelineEvent[];
+}
+
+export const TimelineEventsList = ({ events }: TimelineEventsListProps) => (
+ <Stack gap={0} data-testid="timeline-events-list">
+ {events.map((event) => (
+ <Box key={event.id} className={S.listItemWrapper}>
+ <TimelineEventRow event={event} />
+ </Box>
+ ))}
+ </Stack>
+);
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/index.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/index.ts
new file mode 100644
index 00000000000..fbb0c279037
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/index.ts
@@ -0,0 +1 @@
+export { TimelineEventsBand } from "./TimelineEventsBand";
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/utils.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/utils.ts
new file mode 100644
index 00000000000..1475a2275e3
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/utils.ts
@@ -0,0 +1,69 @@
+import type { EChartsType } from "echarts/core";
+
+import type {
+ TimelineEventGroup,
+ TimelineEventsModel,
+} from "metabase/visualizations/echarts/cartesian/timeline-events/types";
+import type { IconName, TimelineIcon } from "metabase-types/api";
+
+export const TIMELINE_ICON_TO_SMALL_ICON_MAP = {
+ info: "info",
+ note: "note_12",
+ event: "event",
+ star: "star",
+ cake: "cake",
+ mail: "mail_at",
+ mail_at: "mail_at",
+ warning: "warning",
+ bell: "bell_12",
+ cloud: "cloud_12",
+} satisfies Record<TimelineIcon, IconName>;
+
+export interface PositionedTimelineEventGroup {
+ group: TimelineEventGroup;
+ x: number;
+}
+
+export const getTimelineEventGroupIconName = (
+ group: TimelineEventGroup,
+): IconName => {
+ const icon = group.events.at(0)?.icon;
+ return icon != null ? TIMELINE_ICON_TO_SMALL_ICON_MAP[icon] : "star";
+};
+
+interface PositioningInput {
+ timelineEventsModel: TimelineEventsModel;
+ chartInstance: EChartsType;
+ plotBounds: { left: number; right: number };
+ xAxisIndex: number;
+}
+
+export const getPositionedTimelineEventGroups = ({
+ timelineEventsModel,
+ chartInstance,
+ plotBounds,
+ xAxisIndex,
+}: PositioningInput): PositionedTimelineEventGroup[] => {
+ const { left, right } = plotBounds;
+
+ return timelineEventsModel.flatMap((group) => {
+ const pixel = chartInstance.convertToPixel({ xAxisIndex }, group.date);
+ const x = Array.isArray(pixel) ? pixel[0] : pixel;
+
+ if (!Number.isFinite(x) || x < left || x > right) {
+ return [];
+ }
+
+ return [{ group, x }];
+ });
+};
+
+export const arePositionedGroupsEqual = (
+ a: PositionedTimelineEventGroup[],
+ b: PositionedTimelineEventGroup[],
+): boolean =>
+ a.length === b.length &&
+ a.every((item, index) => {
+ const other = b[index];
+ return item.group === other.group && item.x === other.x;
+ });
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/utils.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/utils.unit.spec.ts
new file mode 100644
index 00000000000..3e0977aa584
--- /dev/null
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/TimelineEventsBand/utils.unit.spec.ts
@@ -0,0 +1,146 @@
+import type { EChartsType } from "echarts/core";
+
+import type { ChartBoundsCoords } from "metabase/visualizations/echarts/cartesian/layout/types";
+import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
+import { createMockTimelineEvent } from "metabase-types/api/mocks";
+
+import {
+ arePositionedGroupsEqual,
+ getPositionedTimelineEventGroups,
+ getTimelineEventGroupIconName,
+} from "./utils";
+
+const BOUNDS: ChartBoundsCoords = { top: 0, bottom: 100, left: 50, right: 450 };
+
+const createChartInstance = (
+ pixelByDate: Record<string, number | number[]>,
+): EChartsType =>
+ ({
+ convertToPixel: (_finder: unknown, value: string) =>
+ pixelByDate[value] ?? NaN,
+ }) as unknown as EChartsType;
+
+describe("TimelineEventsBand utils", () => {
+ describe("getTimelineEventGroupIconName", () => {
+ it("maps the event's icon to its 12px display glyph", () => {
+ expect(
+ getTimelineEventGroupIconName({
+ date: "2025-01-01T00:00:00Z",
+ events: [createMockTimelineEvent({ icon: "cloud" })],
+ }),
+ ).toBe("cloud_12");
+ });
+
+ it("falls back to the standard glyph when there is no 12px variant", () => {
+ expect(
+ getTimelineEventGroupIconName({
+ date: "2025-01-01T00:00:00Z",
+ events: [createMockTimelineEvent({ icon: "star" })],
+ }),
+ ).toBe("star");
+ });
+
+ it("falls back to the default icon for an empty group", () => {
+ expect(
+ getTimelineEventGroupIconName({
+ date: "2025-01-01T00:00:00Z",
+ events: [],
+ }),
+ ).toBe("star");
+ });
+ });
+
+ describe("getPositionedTimelineEventGroups", () => {
+ const timelineEventsModel: TimelineEventsModel = [
+ {
+ date: "2025-01-01T00:00:00Z",
+ events: [createMockTimelineEvent({ id: 1, name: "In range" })],
+ },
+ {
+ date: "2025-02-01T00:00:00Z",
+ events: [
+ createMockTimelineEvent({ id: 2, name: "Cluster a" }),
+ createMockTimelineEvent({ id: 3, name: "Cluster b" }),
+ ],
+ },
+ {
+ date: "2025-03-01T00:00:00Z",
+ events: [createMockTimelineEvent({ id: 4, name: "Out of range" })],
+ },
+ ];
+
+ it("maps groups to pixel positions and drops out-of-range groups", () => {
+ const chartInstance = createChartInstance({
+ "2025-01-01T00:00:00Z": 120,
+ "2025-02-01T00:00:00Z": 300,
+ "2025-03-01T00:00:00Z": 999, // beyond bounds.right
+ });
+
+ const positioned = getPositionedTimelineEventGroups({
+ timelineEventsModel,
+ chartInstance,
+ plotBounds: BOUNDS,
+ xAxisIndex: 0,
+ });
+
+ expect(positioned).toEqual([
+ { group: timelineEventsModel[0], x: 120 },
+ { group: timelineEventsModel[1], x: 300 },
+ ]);
+ });
+
+ it("drops groups whose pixel position is NaN", () => {
+ const chartInstance = createChartInstance({});
+
+ const positioned = getPositionedTimelineEventGroups({
+ timelineEventsModel,
+ chartInstance,
+ plotBounds: BOUNDS,
+ xAxisIndex: 0,
+ });
+
+ expect(positioned).toHaveLength(0);
+ });
+
+ it("reads the first coordinate when convertToPixel returns an array", () => {
+ const chartInstance = createChartInstance({
+ "2025-01-01T00:00:00Z": [200, 80],
+ "2025-02-01T00:00:00Z": NaN,
+ "2025-03-01T00:00:00Z": NaN,
+ });
+
+ const positioned = getPositionedTimelineEventGroups({
+ timelineEventsModel,
+ chartInstance,
+ plotBounds: BOUNDS,
+ xAxisIndex: 0,
+ });
+
+ expect(positioned).toHaveLength(1);
+ expect(positioned[0].x).toBe(200);
+ });
+ });
+
+ describe("arePositionedGroupsEqual", () => {
+ const group = {
+ date: "2025-01-01T00:00:00Z",
+ events: [createMockTimelineEvent({ id: 1 })],
+ };
+
+ it("returns true for the same groups at the same positions", () => {
+ expect(
+ arePositionedGroupsEqual([{ group, x: 120 }], [{ group, x: 120 }]),
+ ).toBe(true);
+ });
+
+ it("returns false when a position changes", () => {
+ expect(
+ arePositionedGroupsEqual([{ group, x: 120 }], [{ group, x: 121 }]),
+ ).toBe(false);
+ });
+
+ it("returns false when the number of groups changes", () => {
+ expect(arePositionedGroupsEqual([{ group, x: 120 }], [])).toBe(false);
+ });
+ });
+});
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
index cd5e4490b9a..6977f336ff6 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.ts
@@ -44,7 +44,6 @@ import type {
SeriesModel,
StackModel,
} from "metabase/visualizations/echarts/cartesian/model/types";
-import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
import { getMarkerColorClass } from "metabase/visualizations/echarts/tooltip";
import type {
EChartsSeriesBrushEndEvent,
@@ -72,8 +71,6 @@ import type {
CardId,
DatasetColumn,
RawSeries,
- TimelineEvent,
- TimelineEventId,
} from "metabase-types/api";
import { isSavedCard } from "metabase-types/guards";
@@ -868,62 +865,6 @@ export const getOtherSeriesTooltipModel = (
};
};
-const isMouseEventWithXAxis = (
- event: EChartsSeriesMouseEvent,
-): event is EChartsSeriesMouseEvent<{ xAxis: string }> => {
- return (
- typeof event.data === "object" &&
- event.data !== null &&
- "xAxis" in event.data &&
- typeof event.data.xAxis === "string" &&
- event.data.xAxis.length > 0
- );
-};
-
-export const getTimelineEventsForEvent = (
- timelineEventsModel: TimelineEventsModel,
- event: EChartsSeriesMouseEvent,
-) => {
- if (isMouseEventWithXAxis(event)) {
- return timelineEventsModel.find(
- (timelineEvents) => timelineEvents.date === event.data.xAxis,
- )?.events;
- }
-
- return timelineEventsModel.find(
- (timelineEvents) => timelineEvents.date === event.value,
- )?.events;
-};
-
-export const hasSelectedTimelineEvents = (
- timelineEvents: TimelineEvent[],
- selectedTimelineEventIds?: TimelineEventId[],
-) => {
- return (
- selectedTimelineEventIds != null &&
- selectedTimelineEventIds.length > 0 &&
- timelineEvents.some((timelineEvent) =>
- selectedTimelineEventIds.includes(timelineEvent.id),
- )
- );
-};
-
-export const getTimelineEventsHoverData = (
- timelineEventsModel: TimelineEventsModel,
- event: EChartsSeriesMouseEvent,
-) => {
- const hoveredTimelineEvents = getTimelineEventsForEvent(
- timelineEventsModel,
- event,
- );
- const element = event.event.event.target as Element;
-
- return {
- element: element?.nodeName === "image" ? element : undefined,
- timelineEvents: hoveredTimelineEvents,
- };
-};
-
export const getGoalLineHoverData = (
settings: ComputedVisualizationSettings,
event: EChartsSeriesMouseEvent,
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts
index 96d0837a4e4..2bb8ffeeb39 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/events.unit.spec.ts
@@ -8,21 +8,14 @@ import type {
Datum,
DimensionModel,
} from "metabase/visualizations/echarts/cartesian/model/types";
-import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
-import type { EChartsSeriesMouseEvent } from "metabase/visualizations/echarts/types";
import type { ComputedVisualizationSettings } from "metabase/visualizations/types";
import {
createMockColumn,
createMockDatetimeColumn,
createMockSingleSeries,
- createMockTimelineEvent,
} from "metabase-types/api/mocks";
-import {
- canBrush,
- getEventDimensions,
- getTimelineEventsForEvent,
-} from "./events";
+import { canBrush, getEventDimensions } from "./events";
const CARD_ID = 107;
@@ -350,47 +343,3 @@ describe("canBrush", () => {
).toBe(true);
});
});
-
-describe("getTimelineEventsForEvent", () => {
- const timelineEventsModel: TimelineEventsModel = [
- {
- date: "2027-10-01T00:00:00Z",
- events: [createMockTimelineEvent({ id: 1, name: "RC1" })],
- },
- {
- date: "2027-11-01T00:00:00Z",
- events: [createMockTimelineEvent({ id: 2, name: "RC2" })],
- },
- ];
-
- it("finds events by event.value", () => {
- const event = {
- value: "2027-10-01T00:00:00Z",
- data: null,
- } as unknown as EChartsSeriesMouseEvent;
-
- const result = getTimelineEventsForEvent(timelineEventsModel, event);
- expect(result).toEqual(timelineEventsModel[0].events);
- });
-
- it("finds events by event.data.xAxis when value is not populated (stacked series) #74005", () => {
- const event = {
- value: undefined,
- data: { xAxis: "2027-10-01T00:00:00Z" },
- } as unknown as EChartsSeriesMouseEvent;
-
- const result = getTimelineEventsForEvent(timelineEventsModel, event);
- expect(result).toEqual(timelineEventsModel[0].events);
- });
-
- it("returns undefined when no matching date exists", () => {
- const event = {
- value: "9999-01-01T00:00:00Z",
- data: null,
- } as unknown as EChartsSeriesMouseEvent;
-
- expect(
- getTimelineEventsForEvent(timelineEventsModel, event),
- ).toBeUndefined();
- });
-});
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
index 588bd4ba602..2612c1428d7 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-chart-events.ts
@@ -6,7 +6,6 @@ import { useLatest } from "react-use";
import {
GOAL_LINE_SERIES_ID,
INDEX_KEY,
- TIMELINE_EVENT_DATA_NAME,
} from "metabase/visualizations/echarts/cartesian/constants/dataset";
import type {
BaseCartesianChartModel,
@@ -16,7 +15,6 @@ import {
buildBrushMirrorGraphics,
buildClearBrushMirrorGraphics,
} from "metabase/visualizations/echarts/cartesian/option";
-import type { TimelineEventsModel } from "metabase/visualizations/echarts/cartesian/timeline-events/types";
import { useClickedStateTooltipSync } from "metabase/visualizations/echarts/tooltip";
import {
type EChartsSeriesBrushEndEvent,
@@ -36,9 +34,6 @@ import {
getGoalLineHoverData,
getSeriesClickData,
getSeriesHovered,
- getTimelineEventsForEvent,
- getTimelineEventsHoverData,
- hasSelectedTimelineEvents,
} from "metabase/visualizations/visualizations/CartesianChart/events";
import { getVisualizerSeriesCardIndex } from "metabase/visualizer/utils";
import type { CardId } from "metabase-types/api";
@@ -56,7 +51,6 @@ export const useChartEvents = (
chartRef: React.MutableRefObject<EChartsType | undefined>,
containerRef: React.RefObject<HTMLDivElement>,
chartModel: BaseCartesianChartModel,
- timelineEventsModel: TimelineEventsModel | null,
option: EChartsOption,
renderingContext: RenderingContext,
{
@@ -64,16 +58,12 @@ export const useChartEvents = (
rawSeries,
isVisualizerCard,
visualizerRawSeries = [],
- selectedTimelineEventIds,
settings,
visualizationIsClickable,
onChangeCardAndRun,
onBrush,
onVisualizationClick,
onHoverChange,
- onOpenTimelines,
- onSelectTimelineEvents,
- onDeselectTimelineEvents,
hovered,
clicked,
metadata,
@@ -140,16 +130,6 @@ export const useChartEvents = (
return;
}
- if (timelineEventsModel && event.name === TIMELINE_EVENT_DATA_NAME) {
- const eventData = getTimelineEventsHoverData(
- timelineEventsModel,
- event,
- );
-
- onHoverChange?.(eventData);
- return;
- }
-
if (event.seriesId === GOAL_LINE_SERIES_ID) {
const eventData = getGoalLineHoverData(
settings,
@@ -176,32 +156,6 @@ export const useChartEvents = (
handler: (event: EChartsSeriesMouseEvent) => {
const clickData = getSeriesClickData(chartModel, settings, event);
- if (timelineEventsModel && event.name === TIMELINE_EVENT_DATA_NAME) {
- onOpenTimelines?.();
-
- const clickedTimelineEvents = getTimelineEventsForEvent(
- timelineEventsModel,
- event,
- );
-
- if (!clickedTimelineEvents) {
- return;
- }
-
- if (
- hasSelectedTimelineEvents(
- clickedTimelineEvents,
- selectedTimelineEventIds ?? [],
- )
- ) {
- onDeselectTimelineEvents?.();
- return;
- }
-
- onSelectTimelineEvents?.(clickedTimelineEvents);
- return;
- }
-
if (!visualizationIsClickable(clickData)) {
onOpenQuestion(clickData?.cardId);
return;
@@ -267,16 +221,11 @@ export const useChartEvents = (
[
chartRef,
onHoverChange,
- timelineEventsModel,
chartModel,
hovered,
settings,
visualizationIsClickable,
onVisualizationClick,
- onOpenTimelines,
- selectedTimelineEventIds,
- onSelectTimelineEvents,
- onDeselectTimelineEvents,
onOpenQuestion,
optionRef,
renderingContext,
diff --git a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts
index c95f68b6ed4..bca5579c420 100644
--- a/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts
+++ b/frontend/src/metabase/visualizations/visualizations/CartesianChart/use-models-and-option.ts
@@ -19,7 +19,9 @@ import { getWaterfallChartModel } from "metabase/visualizations/echarts/cartesia
import { getWaterfallChartOption } from "metabase/visualizations/echarts/cartesian/waterfall/option";
import { useBrowserRenderingContext } from "metabase/visualizations/hooks/use-browser-rendering-context";
import type { VisualizationProps } from "metabase/visualizations/types";
-import type { CardDisplayType } from "metabase-types/api";
+import type { CardDisplayType, TimelineEventId } from "metabase-types/api";
+
+const NO_SELECTED_TIMELINE_EVENT_IDS: TimelineEventId[] = [];
export function useModelsAndOption(
{
@@ -31,9 +33,8 @@ export function useModelsAndOption(
height,
hiddenSeries = new Set(),
timelineEvents,
- selectedTimelineEventIds,
+ selectedTimelineEventIds = NO_SELECTED_TIMELINE_EVENT_IDS,
onRender,
- hovered,
isFullscreen,
gridSize,
}: VisualizationProps,
@@ -117,29 +118,10 @@ export function useModelsAndOption(
);
const timelineEventsModel = useMemo(
- () =>
- getTimelineEventsModel(
- chartModel,
- chartLayout,
- timelineEvents ?? [],
- renderingContext,
- ),
- [chartModel, chartLayout, timelineEvents, renderingContext],
+ () => getTimelineEventsModel(chartModel, chartLayout, timelineEvents ?? []),
+ [chartModel, chartLayout, timelineEvents],
);
- const selectedOrHoveredTimelineEventIds = useMemo(() => {
- const ids = [];
-
- if (selectedTimelineEventIds != null) {
- ids.push(...selectedTimelineEventIds);
- }
- if (hovered?.timelineEvents != null) {
- ids.push(...hovered.timelineEvents.map((e) => e.id));
- }
-
- return ids;
- }, [selectedTimelineEventIds, hovered?.timelineEvents]);
-
const tooltipOption = useMemo(() => {
return getTooltipOption(
chartModel,
@@ -164,8 +146,9 @@ export function useModelsAndOption(
chartModel as WaterfallChartModel,
width,
chartLayout,
+ hasTimelineEvents,
timelineEventsModel,
- selectedOrHoveredTimelineEventIds,
+ selectedTimelineEventIds,
settings,
shouldAnimate,
renderingContext,
@@ -175,8 +158,9 @@ export function useModelsAndOption(
baseOption = getScatterPlotOption(
chartModel as ScatterPlotModel,
chartLayout,
+ hasTimelineEvents,
timelineEventsModel,
- selectedOrHoveredTimelineEventIds,
+ selectedTimelineEventIds,
settings,
width,
shouldAnimate,
@@ -187,8 +171,9 @@ export function useModelsAndOption(
baseOption = getCartesianChartOption(
chartModel as CartesianChartModel,
chartLayout,
+ hasTimelineEvents,
timelineEventsModel,
- selectedOrHoveredTimelineEventIds,
+ selectedTimelineEventIds,
settings,
width,
shouldAnimate,
@@ -207,11 +192,18 @@ export function useModelsAndOption(
tooltipOption,
chartModel,
chartLayout,
+ hasTimelineEvents,
timelineEventsModel,
- selectedOrHoveredTimelineEventIds,
+ selectedTimelineEventIds,
settings,
renderingContext,
]);
- return { chartModel, timelineEventsModel, option, renderingContext };
+ return {
+ chartModel,
+ chartLayout,
+ timelineEventsModel,
+ option,
+ renderingContext,
+ };
}
diff --git a/src/metabase/timeline/models/timeline_event.clj b/src/metabase/timeline/models/timeline_event.clj
index 8b83d6ecc8d..fdc6ea013da 100644
--- a/src/metabase/timeline/models/timeline_event.clj
+++ b/src/metabase/timeline/models/timeline_event.clj
@@ -22,7 +22,9 @@
(def Icon
"Schema for Timeline and TimelineEvents `icon`"
- [:enum default-icon "cake" "mail" "warning" "bell" "cloud"])
+ ;; using "mail" icon is deprecated, but we keep it for backwards compatibility
+ [:enum default-icon "cake" "mail" "mail_at" "warning" "bell" "cloud"
+ "info" "note" "event"])
(def Source
"Timeline Event Source Schema. For Snowplow Events, where the Event is created from is important.