The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
GDGT-3395: Move the timeline modals onto the Modal API (#84758)
Will Fry2b07f62729fe
diff --git a/e2e/test/scenarios/organization/timelines-collection.cy.spec.js b/e2e/test/scenarios/organization/timelines-collection.cy.spec.jsindex 31ba68f9021..4b20d3034de 100644--- a/e2e/test/scenarios/organization/timelines-collection.cy.spec.js+++ b/e2e/test/scenarios/organization/timelines-collection.cy.spec.js@@ -17,7 +17,6 @@ describe("scenarios > organization > timelines > collection", () => {cy.intercept("POST", "/api/timeline-event").as("createEvent");cy.intercept("PUT", "/api/timeline-event/*").as("updateEvent");cy.intercept("DELETE", "/api/timeline-event/*").as("deleteEvent");- cy.intercept("GET", "/api/timeline/*").as("getTimeline");});describe("as admin", () => {@@ -540,7 +539,7 @@ describe("scenarios > organization > timelines > collection", () => {// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usagecy.findByText("First collection events");cy.wait("@createTimeline");- cy.icon("close").click();+ H.modal().findByLabelText("Close").click();cy.findByDisplayValue("First collection").clear()@@ -594,7 +593,6 @@ describe("scenarios > organization > timelines > collection", () => {"type/Temporal": { time_style: "HH:mm" },});cy.visit("/collection/root/timelines");- cy.wait("@getTimeline");cy.findByTestId("event-list").findByText("October 12, 2022, 18:15")diff --git a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx b/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsxdeleted file mode 100644index 58ce6f60d10..00000000000--- a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/LoadingAndErrorWrapper.tsx+++ /dev/null@@ -1,24 +0,0 @@-import {- LoadingAndErrorWrapper as BaseLoadingAndErrorWrapper,- type LoadingAndErrorWrapperProps as BaseLoadingAndErrorWrapperProps,-} from "metabase/common/components/LoadingAndErrorWrapper";-import { MODAL_MIN_HEIGHT } from "metabase/timelines/common/constants";-import { Flex } from "metabase/ui";--// Rendered as a leaf, and the base wrapper's render-function children would not fit Flex anyway-type LoadingAndErrorWrapperProps = Omit<- BaseLoadingAndErrorWrapperProps,- "children"->;--const LoadingAndErrorWrapper = (props: LoadingAndErrorWrapperProps) => (- <Flex- component={BaseLoadingAndErrorWrapper}- direction="column"- mih={MODAL_MIN_HEIGHT}- {...props}- />-);--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default LoadingAndErrorWrapper;diff --git a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/index.ts b/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/index.tsdeleted file mode 100644index 114a6cb6b01..00000000000--- a/frontend/src/metabase/timelines/collections/components/LoadingAndErrorWrapper/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./LoadingAndErrorWrapper";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/TimelineDetailsContent.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/TimelineDetailsContent.tsxnew file mode 100644index 00000000000..a6a3f7033e6--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/TimelineDetailsContent.tsx@@ -0,0 +1,115 @@+import { type ChangeEventHandler, type JSX, useMemo, useState } from "react";+import { match } from "ts-pattern";+import { t } from "ttag";+import _ from "underscore";++import { ForwardRefLink } from "metabase/common/components/Link";+import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";+import { TimelineModalScrollArea } from "metabase/timelines/common/components/TimelineModal";+import { Button, Flex, Icon, TextInput } from "metabase/ui";+import * as Urls from "metabase/urls";+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";+import { parseTimestamp } from "metabase/utils/time-dayjs";+import type { Timeline, TimelineEvent } from "metabase-types/api";++import EventList from "../EventList";+import SearchEmptyState from "../SearchEmptyState";+import TimelineEmptyState from "../TimelineEmptyState";++export interface TimelineDetailsContentProps {+ timeline: Timeline;+ isArchive?: boolean;+ onArchive?: (event: TimelineEvent) => void;+ onUnarchive?: (event: TimelineEvent) => void;+}++const TimelineDetailsContent = ({+ timeline,+ isArchive = false,+ onArchive,+ onUnarchive,+}: TimelineDetailsContentProps): JSX.Element => {+ const [inputText, setInputText] = useState("");++ const searchText = useDebouncedValue(+ inputText.toLowerCase(),+ SEARCH_DEBOUNCE_DURATION,+ );++ const events = useMemo(() => {+ return getEvents(timeline.events, searchText, isArchive);+ }, [timeline, searchText, isArchive]);++ const isNotEmpty = events.length > 0;+ const isSearching = searchText.length > 0;+ const canWrite = timeline.collection?.can_write;++ const handleSearchChange: ChangeEventHandler<HTMLInputElement> = (e) =>+ setInputText(e.target.value);++ return (+ <>+ {(isNotEmpty || isSearching) && (+ <Flex gap="lg" mb="lg">+ <TextInput+ flex="1 1 auto"+ value={inputText}+ placeholder={t`Search for an event`}+ leftSection={<Icon name="search" />}+ onChange={handleSearchChange}+ />+ {canWrite && !isArchive && (+ <Button+ size="lg"+ component={ForwardRefLink}+ to={Urls.newEventInCollection(timeline)}+ role="button"+ flex="0 0 auto"+ >{t`Create event`}</Button>+ )}+ </Flex>+ )}+ <TimelineModalScrollArea justify={isNotEmpty ? undefined : "center"}>+ {match({ isNotEmpty, isFiltered: isArchive || isSearching })+ .with({ isNotEmpty: true }, () => (+ <EventList+ events={events}+ timeline={timeline}+ onArchive={onArchive}+ onUnarchive={onUnarchive}+ />+ ))+ .with({ isFiltered: true }, () => <SearchEmptyState />)+ .otherwise(() => (+ <TimelineEmptyState timeline={timeline} />+ ))}+ </TimelineModalScrollArea>+ </>+ );+};++const getEvents = (+ events: TimelineEvent[] = [],+ searchText: string,+ isArchive: boolean,+) => {+ const chain = searchText+ ? _.chain(events).filter((e) => isEventMatch(e, searchText))+ : _.chain(events);++ return chain+ .filter((e) => e.archived === isArchive)+ .sortBy((e) => parseTimestamp(e.timestamp))+ .reverse()+ .value();+};++const isEventMatch = (event: TimelineEvent, searchText: string) => {+ return (+ event.name.toLowerCase().includes(searchText) ||+ event.description?.toLowerCase()?.includes(searchText)+ );+};++// eslint-disable-next-line import/no-default-export -- deprecated usage+export default TimelineDetailsContent;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.unit.spec.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/TimelineDetailsContent.unit.spec.tsxsimilarity index 56%rename from frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.unit.spec.tsxrename to frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/TimelineDetailsContent.unit.spec.tsxindex e9d1ed0d782..251f246389a 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/TimelineDetailsContent.unit.spec.tsx@@ -2,13 +2,12 @@ import userEvent from "@testing-library/user-event";import { renderWithProviders, screen, waitFor } from "__support__/ui";import {- createMockCollection,createMockTimeline,createMockTimelineEvent,} from "metabase-types/api/mocks";-import type { TimelineDetailsModalProps } from "./TimelineDetailsModal";-import TimelineDetailsModal from "./TimelineDetailsModal";+import type { TimelineDetailsContentProps } from "./TimelineDetailsContent";+import TimelineDetailsContent from "./TimelineDetailsContent";// The search debounce is idle time in these tests: they assert what a search// returns, not that the input waits before it asks.@@ -17,43 +16,11 @@ jest.mock("metabase/utils/constants", () => ({SEARCH_DEBOUNCE_DURATION: 0,}));-function setup(props: TimelineDetailsModalProps) {- renderWithProviders(<TimelineDetailsModal {...props} />);+function setup(props: TimelineDetailsContentProps) {+ renderWithProviders(<TimelineDetailsContent {...props} />);}-describe("TimelineDetailsModal", () => {- it("should use the collection's name for default timelines", () => {- const props = getProps({- timeline: createMockTimeline({- name: "Metrics events",- default: true,- collection: createMockCollection({- name: "Analytics",- }),- }),- });-- setup(props);-- expect(screen.getByText("Analytics events")).toBeInTheDocument();- });-- it("should use the timeline's name for non-default timelines", () => {- const props = getProps({- timeline: createMockTimeline({- name: "Metrics events",- default: false,- collection: createMockCollection({- name: "Analytics",- }),- }),- });-- setup(props);-- expect(screen.getByText("Metrics events")).toBeInTheDocument();- });-+describe("TimelineDetailsContent", () => {it("should search a list of events", async () => {const props = getProps({timeline: createMockTimeline({@@ -89,8 +56,8 @@ describe("TimelineDetailsModal", () => {});const getProps = (- opts?: Partial<TimelineDetailsModalProps>,-): TimelineDetailsModalProps => ({+ opts?: Partial<TimelineDetailsContentProps>,+): TimelineDetailsContentProps => ({timeline: createMockTimeline(),...opts,});diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/index.ts b/frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/index.tssimilarity index 58%rename from frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/index.tsrename to frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/index.tsindex bd96db6ad65..f7c9e287d4a 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/index.ts+++ b/frontend/src/metabase/timelines/collections/components/TimelineDetailsContent/index.ts@@ -1,2 +1,2 @@// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./TimelineDetailsModal";+export { default } from "./TimelineDetailsContent";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsxdeleted file mode 100644index dfc402c8ecd..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineDetailsModal/TimelineDetailsModal.tsx+++ /dev/null@@ -1,224 +0,0 @@-import {- type ChangeEventHandler,- type JSX,- useCallback,- useMemo,- useState,-} from "react";-import { t } from "ttag";-import _ from "underscore";--import { ForwardRefLink } from "metabase/common/components/Link";-import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";-import { getTimelineName } from "metabase/common/utils/timelines";-import CS from "metabase/css/core/index.css";-import { ModalHeader } from "metabase/timelines/common/components/ModalHeader";-import { MODAL_MIN_HEIGHT } from "metabase/timelines/common/constants";-import { ActionIcon, Button, Flex, Icon, Menu, TextInput } from "metabase/ui";-import * as Urls from "metabase/urls";-import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";-import { parseTimestamp } from "metabase/utils/time-dayjs";-import type { Timeline, TimelineEvent } from "metabase-types/api";--import EventList from "../EventList";-import SearchEmptyState from "../SearchEmptyState";-import TimelineEmptyState from "../TimelineEmptyState";--export interface TimelineDetailsModalProps {- timeline: Timeline;- isArchive?: boolean;- isOnlyTimeline?: boolean;- onArchive?: (event: TimelineEvent) => void;- onUnarchive?: (event: TimelineEvent) => void;- onClose?: () => void;- onGoBack?: (timeline: Timeline) => void;-}--const TimelineDetailsModal = ({- timeline,- isArchive = false,- isOnlyTimeline = false,- onArchive,- onUnarchive,- onClose,- onGoBack,-}: TimelineDetailsModalProps): JSX.Element => {- const title = isArchive ? t`Archived events` : getTimelineName(timeline);- const [inputText, setInputText] = useState("");-- const searchText = useDebouncedValue(- inputText.toLowerCase(),- SEARCH_DEBOUNCE_DURATION,- );-- const events = useMemo(() => {- return getEvents(timeline.events, searchText, isArchive);- }, [timeline, searchText, isArchive]);-- const menuItems = useMemo(() => {- return getMenuItems(timeline, isArchive, isOnlyTimeline);- }, [timeline, isArchive, isOnlyTimeline]);-- const handleGoBack = useCallback(() => {- onGoBack?.(timeline);- }, [timeline, onGoBack]);-- const isNotEmpty = events.length > 0;- const isSearching = searchText.length > 0;- const canWrite = timeline.collection?.can_write;- const canGoBack = isArchive || !isOnlyTimeline;-- const handleSearchChange: ChangeEventHandler<HTMLInputElement> = (e) =>- setInputText(e.target.value);-- return (- <Flex direction="column" mih={MODAL_MIN_HEIGHT}>- <ModalHeader- title={title}- onClose={onClose}- onGoBack={canGoBack ? handleGoBack : undefined}- >- {menuItems.length > 0 && (- <Menu position="bottom-end" shadow="sm">- <Menu.Target>- <ActionIcon variant="subtle" aria-label={t`Timeline menu`}>- <Icon name="ellipsis" />- </ActionIcon>- </Menu.Target>- <Menu.Dropdown>{menuItems}</Menu.Dropdown>- </Menu>- )}- </ModalHeader>- {(isNotEmpty || isSearching) && (- <Flex pt="lg" px="xxl">- <TextInput- flex="1 1 auto"- value={inputText}- placeholder={t`Search for an event`}- leftSection={<Icon name="search" />}- onChange={handleSearchChange}- />- {canWrite && !isArchive && (- <Button- size="lg"- component={ForwardRefLink}- to={Urls.newEventInCollection(timeline)}- role="button"- flex="0 0 auto"- ml="lg"- >{t`Create event`}</Button>- )}- </Flex>- )}- <Flex- className={CS.overflowYAuto}- direction="column"- flex="1 1 auto"- justify={isNotEmpty ? undefined : "center"}- mt="lg"- pt="lg"- px="xxl"- pb="xxl"- >- {isNotEmpty ? (- <EventList- events={events}- timeline={timeline}- onArchive={onArchive}- onUnarchive={onUnarchive}- />- ) : isArchive || isSearching ? (- <SearchEmptyState />- ) : (- <TimelineEmptyState timeline={timeline} />- )}- </Flex>- </Flex>- );-};--const getEvents = (- events: TimelineEvent[] = [],- searchText: string,- isArchive: boolean,-) => {- const chain = searchText- ? _.chain(events).filter((e) => isEventMatch(e, searchText))- : _.chain(events);-- return chain- .filter((e) => e.archived === isArchive)- .sortBy((e) => parseTimestamp(e.timestamp))- .reverse()- .value();-};--const isEventMatch = (event: TimelineEvent, searchText: string) => {- return (- event.name.toLowerCase().includes(searchText) ||- event.description?.toLowerCase()?.includes(searchText)- );-};--const getMenuItems = (- timeline: Timeline,- isArchive: boolean,- isOnlyTimeline: boolean,-) => {- const items: JSX.Element[] = [];-- if (timeline.collection?.can_write && !isArchive) {- items.push(- <Menu.Item- key="new-timeline"- component={ForwardRefLink}- to={Urls.newTimelineInCollection(timeline.collection)}- >- {t`New timeline`}- </Menu.Item>,- <Menu.Item- key="edit-timeline-details"- component={ForwardRefLink}- to={Urls.editTimelineInCollection(timeline)}- >- {t`Edit timeline details`}- </Menu.Item>,- <Menu.Item- key="move-timeline"- component={ForwardRefLink}- to={Urls.moveTimelineInCollection(timeline)}- >- {t`Move timeline`}- </Menu.Item>,- );- }-- if (!isArchive) {- items.push(- <Menu.Item- key="view-archived-events"- component={ForwardRefLink}- to={Urls.timelineArchiveInCollection(timeline)}- >- {t`View archived events`}- </Menu.Item>,- );- }-- if (isOnlyTimeline) {- items.push(- <Menu.Item- key="view-archived-timelines"- component={ForwardRefLink}- to={Urls.timelinesArchiveInCollection(timeline.collection)}- >- {t`View archived timelines`}- </Menu.Item>,- );- }-- return items;-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineDetailsModal;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/TimelineIndexModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/TimelineIndexModal.tsxdeleted file mode 100644index 79a06db5467..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/TimelineIndexModal.tsx+++ /dev/null@@ -1,33 +0,0 @@-import type { JSX } from "react";--import type { Timeline } from "metabase-types/api";--import TimelineDetailsModal from "../../containers/TimelineDetailsModal";-import TimelineListModal from "../../containers/TimelineListModal";-import type { ModalParams } from "../../types";--export interface TimelineIndexModalProps {- timelines: Timeline[];- params: ModalParams;- onClose?: () => void;-}--const TimelineIndexModal = ({- timelines,- params,- onClose,-}: TimelineIndexModalProps): JSX.Element => {- if (timelines.length === 1) {- return (- <TimelineDetailsModal- params={{ ...params, timelineId: String(timelines[0].id) }}- onClose={onClose}- />- );- } else {- return <TimelineListModal params={params} onClose={onClose} />;- }-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineIndexModal;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/index.ts b/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/index.tsdeleted file mode 100644index 484666f86d4..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./TimelineIndexModal";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListContent/TimelineListContent.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListContent/TimelineListContent.tsxnew file mode 100644index 00000000000..4f3456ca0b0--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/TimelineListContent/TimelineListContent.tsx@@ -0,0 +1,46 @@+import { type JSX, useMemo } from "react";+import { match } from "ts-pattern";++import { getSortedTimelines } from "metabase/common/utils/timelines";+import { TimelineModalScrollArea } from "metabase/timelines/common/components/TimelineModal";+import type { Collection, Timeline } from "metabase-types/api";++import SearchEmptyState from "../SearchEmptyState";+import TimelineEmptyState from "../TimelineEmptyState";+import TimelineList from "../TimelineList";++export interface TimelineListContentProps {+ timelines: Timeline[];+ collection: Collection;+ isArchive?: boolean;+ onUnarchive?: (timeline: Timeline) => void;+}++const TimelineListContent = ({+ timelines,+ collection,+ isArchive = false,+ onUnarchive,+}: TimelineListContentProps): JSX.Element => {+ const hasTimelines = timelines.length > 0;++ const sortedTimelines = useMemo(() => {+ return getSortedTimelines(timelines, collection);+ }, [timelines, collection]);++ return (+ <TimelineModalScrollArea justify={hasTimelines ? undefined : "center"}>+ {match({ hasTimelines, isArchive })+ .with({ hasTimelines: true }, () => (+ <TimelineList timelines={sortedTimelines} onUnarchive={onUnarchive} />+ ))+ .with({ isArchive: true }, () => <SearchEmptyState isTimeline />)+ .otherwise(() => (+ <TimelineEmptyState collection={collection} />+ ))}+ </TimelineModalScrollArea>+ );+};++// eslint-disable-next-line import/no-default-export -- deprecated usage+export default TimelineListContent;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.unit.spec.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListContent/TimelineListContent.unit.spec.tsxsimilarity index 70%rename from frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.unit.spec.tsxrename to frontend/src/metabase/timelines/collections/components/TimelineListContent/TimelineListContent.unit.spec.tsxindex c3f01ee2983..f726c7d7285 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineListContent/TimelineListContent.unit.spec.tsx@@ -4,14 +4,14 @@ import {createMockTimeline,} from "metabase-types/api/mocks";-import type { TimelineListModalProps } from "./TimelineListModal";-import TimelineListModal from "./TimelineListModal";+import type { TimelineListContentProps } from "./TimelineListContent";+import TimelineListContent from "./TimelineListContent";-function setup(props: TimelineListModalProps) {- renderWithProviders(<TimelineListModal {...props} />);+function setup(props: TimelineListContentProps) {+ renderWithProviders(<TimelineListContent {...props} />);}-describe("TimelineListModal", () => {+describe("TimelineListContent", () => {it("should render a list of timelines", () => {const props = getProps({timelines: [createMockTimeline({ name: "Releases" })],@@ -36,8 +36,8 @@ describe("TimelineListModal", () => {});const getProps = (- opts?: Partial<TimelineListModalProps>,-): TimelineListModalProps => ({+ opts?: Partial<TimelineListContentProps>,+): TimelineListContentProps => ({timelines: [],collection: createMockCollection(),...opts,diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/index.ts b/frontend/src/metabase/timelines/collections/components/TimelineListContent/index.tssimilarity index 59%rename from frontend/src/metabase/timelines/collections/containers/TimelineListModal/index.tsrename to frontend/src/metabase/timelines/collections/components/TimelineListContent/index.tsindex 79b93461665..b252f3fe331 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/index.ts+++ b/frontend/src/metabase/timelines/collections/components/TimelineListContent/index.ts@@ -1,2 +1,2 @@// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./TimelineListModal";+export { default } from "./TimelineListContent";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsxdeleted file mode 100644index 1c8960525e1..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/TimelineListModal.tsx+++ /dev/null@@ -1,134 +0,0 @@-import { type JSX, useCallback, useMemo } from "react";-import { t } from "ttag";--import { ForwardRefLink } from "metabase/common/components/Link";-import {- getDefaultTimelineName,- getSortedTimelines,-} from "metabase/common/utils/timelines";-import CS from "metabase/css/core/index.css";-import { ModalHeader } from "metabase/timelines/common/components/ModalHeader";-import { MODAL_MIN_HEIGHT } from "metabase/timelines/common/constants";-import { ActionIcon, Flex, Icon, Menu } from "metabase/ui";-import * as Urls from "metabase/urls";-import type { Collection, Timeline } from "metabase-types/api";--import SearchEmptyState from "../SearchEmptyState";-import TimelineEmptyState from "../TimelineEmptyState";-import TimelineList from "../TimelineList";--export interface TimelineListModalProps {- timelines: Timeline[];- collection: Collection;- isArchive?: boolean;- onUnarchive?: (timeline: Timeline) => void;- onClose?: () => void;- onGoBack?: (collection: Collection) => void;-}--const TimelineListModal = ({- timelines,- collection,- isArchive = false,- onUnarchive,- onClose,- onGoBack,-}: TimelineListModalProps): JSX.Element => {- const title = getTitle(timelines, collection, isArchive);- const menuItems = getMenuItems(collection, isArchive);- const hasTimelines = timelines.length > 0;- const hasMenuItems = menuItems.length > 0;-- const sortedTimelines = useMemo(() => {- return getSortedTimelines(timelines, collection);- }, [timelines, collection]);-- const handleGoBack = useCallback(() => {- onGoBack?.(collection);- }, [collection, onGoBack]);-- const pathOptions = {- showPath: hasTimelines,- collectionName: collection.name,- };-- return (- <Flex direction="column" mih={MODAL_MIN_HEIGHT}>- <ModalHeader- title={title}- onClose={onClose}- onGoBack={isArchive ? handleGoBack : undefined}- pathOptions={pathOptions}- >- {hasMenuItems && (- <Menu position="bottom-end" shadow="sm">- <Menu.Target>- <ActionIcon variant="subtle" aria-label={t`Timelines menu`}>- <Icon name="ellipsis" />- </ActionIcon>- </Menu.Target>- <Menu.Dropdown>{menuItems}</Menu.Dropdown>- </Menu>- )}- </ModalHeader>- <Flex- className={CS.overflowYAuto}- direction="column"- flex="1 1 auto"- justify={hasTimelines ? undefined : "center"}- mt="lg"- pt="lg"- px="xxl"- pb="xxl"- >- {hasTimelines ? (- <TimelineList timelines={sortedTimelines} onUnarchive={onUnarchive} />- ) : isArchive ? (- <SearchEmptyState isTimeline={isArchive} />- ) : (- <TimelineEmptyState collection={collection} />- )}- </Flex>- </Flex>- );-};--const getTitle = (- timelines: Timeline[],- collection: Collection,- isArchive: boolean,-) => {- if (isArchive) {- return t`Archived timelines`;- } else if (timelines.length) {- return t`Events`;- } else {- return getDefaultTimelineName(collection);- }-};--const getMenuItems = (collection: Collection, isArchive: boolean) => {- if (!collection.can_write || isArchive) {- return [];- }-- return [- <Menu.Item- key="new-timeline"- component={ForwardRefLink}- to={Urls.newTimelineInCollection(collection)}- >- {t`New timeline`}- </Menu.Item>,- <Menu.Item- key="view-archived-timelines"- component={ForwardRefLink}- to={Urls.timelinesArchiveInCollection(collection)}- >- {t`View archived timelines`}- </Menu.Item>,- ];-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineListModal;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineListModal/index.ts b/frontend/src/metabase/timelines/collections/components/TimelineListModal/index.tsdeleted file mode 100644index 79b93461665..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineListModal/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./TimelineListModal";diff --git a/frontend/src/metabase/timelines/collections/components/TimelineQueryModal/TimelineQueryModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineQueryModal/TimelineQueryModal.tsxnew file mode 100644index 00000000000..6beee4bfd2f--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/TimelineQueryModal/TimelineQueryModal.tsx@@ -0,0 +1,50 @@+import type { ReactNode } from "react";++import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";+import type { TimelineModalHeaderProps } from "metabase/timelines/common/components/TimelineModalHeader";++export interface TimelineQueryModalProps<T> {+ data: T | undefined;+ isLoading: boolean;+ error: unknown;+ /** Shown while loading, for modals whose title doesn't depend on `data`. */+ loadingTitle?: ReactNode;+ getHeaderProps: (data: T) => TimelineModalHeaderProps;+ children: (data: T) => ReactNode;+ onClose: () => void;+}++/**+ * A tall `TimelineModal` showing a spinner or the error until `data` has+ * loaded, then the header from `getHeaderProps` and the content from+ * `children`. The modal stays mounted through every state.+ */+export function TimelineQueryModal<T>({+ data,+ isLoading,+ error,+ loadingTitle,+ getHeaderProps,+ children,+ onClose,+}: TimelineQueryModalProps<T>) {+ const isLoaded = !isLoading && !error && data !== undefined;++ return (+ <TimelineModal+ tall+ animated={false}+ onClose={onClose}+ {...(isLoaded ? getHeaderProps(data) : { title: loadingTitle })}+ >+ {isLoaded ? (+ children(data)+ ) : (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ )}+ </TimelineModal>+ );+}diff --git a/frontend/src/metabase/timelines/collections/components/TimelineQueryModal/index.ts b/frontend/src/metabase/timelines/collections/components/TimelineQueryModal/index.tsnew file mode 100644index 00000000000..399de99107f--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/TimelineQueryModal/index.ts@@ -0,0 +1,2 @@+export { TimelineQueryModal } from "./TimelineQueryModal";+export type { TimelineQueryModalProps } from "./TimelineQueryModal";diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsxindex f8ac9b50bbb..6492cd29a2c 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx@@ -1,11 +1,16 @@+import { t } from "ttag";+import {skipToken,useDeleteTimelineEventMutation,useGetTimelineEventQuery,} from "metabase/api";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";-import DeleteEventModal from "metabase/timelines/common/components/DeleteEventModal";+import { DeleteConfirmationFooter } from "metabase/timelines/common/components/DeleteConfirmationFooter";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type { TimelineEvent } from "metabase-types/api";@@ -23,12 +28,22 @@ function DeleteEventModalContainer({ params, onClose }: ModalComponentProps) {onClose();};- if (isLoading || error || !event) {- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;- }-return (- <DeleteEventModal event={event} onSubmit={onSubmit} onClose={onClose} />+ <TimelineModal+ title={event ? t`Delete ${event.name}?` : undefined}+ onClose={onClose}+ animated={false}+ tall={isLoading || !!error || !event}+ >+ {isLoading || error || !event ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <DeleteConfirmationFooter+ onDelete={() => onSubmit(event)}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsxindex 9b3c8d17f8b..d08abd16279 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -1,18 +1,22 @@+import { t } from "ttag";+import {skipToken,useDeleteTimelineMutation,useGetTimelineQuery,} from "metabase/api";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";-import DeleteTimelineModal from "metabase/timelines/common/components/DeleteTimelineModal";+import { DeleteConfirmationFooter } from "metabase/timelines/common/components/DeleteConfirmationFooter";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";function DeleteTimelineModalContainer({params,onClose,- ...props}: ModalComponentProps) {const [deleteTimeline] = useDeleteTimelineMutation();const id = Urls.extractEntityId(params.timelineId);@@ -22,24 +26,27 @@ function DeleteTimelineModalContainer({error,} = useGetTimelineQuery(id != null ? { id, include: "events" } : skipToken);- if (isLoading || error || !timeline) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }-const handleSubmit = async (timeline: Timeline) => {await deleteTimeline(timeline.id).unwrap();onClose();};return (- <DeleteTimelineModal- {...props}+ <TimelineModal+ title={timeline ? t`Delete ${timeline.name}?` : undefined}onClose={onClose}- timeline={timeline}- onSubmit={handleSubmit}- />+ animated={false}+ tall={isLoading || !!error || !timeline}+ >+ {isLoading || error || !timeline ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <DeleteConfirmationFooter+ onDelete={() => handleSubmit(timeline)}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsxindex 4c265114226..6d2d2869dd4 100644--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx@@ -1,3 +1,5 @@+import { t } from "ttag";+import {skipToken,useGetTimelineEventQuery,@@ -7,12 +9,14 @@ import {import { useSetArchive } from "metabase/archive/hooks";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";import { useNavigate } from "metabase/router";-import EditEventModal from "metabase/timelines/common/components/EditEventModal";+import EditEventForm from "metabase/timelines/common/components/EditEventForm";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-function EditEventModalContainer({ params, onClose }: ModalComponentProps) {const navigate = useNavigate();const archive = useSetArchive();@@ -49,18 +53,26 @@ function EditEventModalContainer({ params, onClose }: ModalComponentProps) {const isLoading = isTimelineLoading || isEventLoading;const error = timelineError ?? eventError;- if (isLoading || error || !event) {- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;- }-return (- <EditEventModal- event={event}- timeline={timeline}- onSubmit={onSubmit}- onArchive={onArchive}+ <TimelineModal+ title={t`Edit event`}onClose={onClose}- />+ animated={false}+ density="relaxed"+ tall={isLoading || !!error || !event}+ >+ {isLoading || error || !event ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <EditEventForm+ event={event}+ timeline={timeline}+ onSubmit={onSubmit}+ onArchive={onArchive}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsxindex 769527dc4aa..fbc3bb8ac2e 100644--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx@@ -1,3 +1,5 @@+import { t } from "ttag";+import {skipToken,useGetTimelineQuery,@@ -6,13 +8,15 @@ import {import { useSetArchive } from "metabase/archive/hooks";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";import { useNavigate } from "metabase/router";-import EditTimelineModal from "metabase/timelines/common/components/EditTimelineModal";+import EditTimelineForm from "metabase/timelines/common/components/EditTimelineForm";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";--function EditTimelineModalContainer({ params, ...props }: ModalComponentProps) {+function EditTimelineModalContainer({ params, onClose }: ModalComponentProps) {const navigate = useNavigate();const archive = useSetArchive();const [updateTimeline] = useUpdateTimelineMutation();@@ -23,12 +27,6 @@ function EditTimelineModalContainer({ params, ...props }: ModalComponentProps) {error,} = useGetTimelineQuery(id != null ? { id, include: "events" } : skipToken);- if (isLoading || error || !timeline) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }-const handleSubmit = async (timeline: Timeline) => {await updateTimeline(timeline).unwrap();navigate(Urls.timelineInCollection(timeline));@@ -40,12 +38,24 @@ function EditTimelineModalContainer({ params, ...props }: ModalComponentProps) {};return (- <EditTimelineModal- {...props}- timeline={timeline}- onSubmit={handleSubmit}- onArchive={handleArchive}- />+ <TimelineModal+ title={t`Edit event timeline`}+ onClose={onClose}+ animated={false}+ density="relaxed"+ tall={isLoading || !!error || !timeline}+ >+ {isLoading || error || !timeline ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <EditTimelineForm+ timeline={timeline}+ onSubmit={handleSubmit}+ onArchive={handleArchive}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsxindex 365607eea87..be31ea7c990 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -1,33 +1,23 @@+import { t } from "ttag";+import {skipToken,useGetCollectionQuery,useGetTimelineEventQuery,useListTimelinesQuery,} from "metabase/api";+import type { ModalComponentProps } from "metabase/common/components/ModalRoute";import { useNavigate } from "metabase/router";+import { MoveEventForm } from "metabase/timelines/common/components/MoveEventForm";import {- MoveEventModal,- type MoveEventModalProps,-} from "metabase/timelines/common/components/MoveEventModal";+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import { useSetTimeline } from "metabase/timelines/common/hooks";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import type { ModalParams } from "../../types";--interface OwnProps {- params: ModalParams;- onClose?: () => void;-}--type ContainerProps = Omit<- MoveEventModalProps,- "event" | "timelines" | "collection" | "onSubmit"-> &- OwnProps;--function MoveEventModalContainer({ params, ...props }: ContainerProps) {+function MoveEventModalContainer({ params, onClose }: ModalComponentProps) {const setTimeline = useSetTimeline();const navigate = useNavigate();const eventId = Urls.extractEntityId(params.timelineEventId);@@ -66,18 +56,25 @@ function MoveEventModalContainer({ params, ...props }: ContainerProps) {const isLoading = isEventLoading || isTimelinesLoading || isCollectionLoading;const error = eventError ?? timelinesError ?? collectionError;- if (isLoading || error || !event) {- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;- }-return (- <MoveEventModal- {...props}- event={event}- timelines={timelines}- collection={collection}- onSubmit={handleSubmit}- />+ <TimelineModal+ title={event ? t`Move ${event.name}` : undefined}+ onClose={onClose}+ animated={false}+ tall+ >+ {isLoading || error || !event ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <MoveEventForm+ event={event}+ timelines={timelines}+ collection={collection}+ onSubmit={handleSubmit}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsxindex 7ffd2b4fde8..3e344009387 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx@@ -12,12 +12,14 @@ import { getDefaultTimelineName } from "metabase/common/utils/timelines";import { useDispatch } from "metabase/redux";import { useNavigate } from "metabase/router";import MoveTimelineModal from "metabase/timelines/common/components/MoveTimelineModal";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type { CollectionId, Timeline } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";--function MoveTimelineModalContainer({ params, ...props }: ModalComponentProps) {+function MoveTimelineModalContainer({ params, onClose }: ModalComponentProps) {const dispatch = useDispatch();const navigate = useNavigate();const setCollection = useSetCollection();@@ -65,12 +67,18 @@ function MoveTimelineModalContainer({ params, ...props }: ModalComponentProps) {if (isLoading || error || !timeline) {return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />+ <TimelineModal tall onClose={onClose} animated={false}>+ <TimelineModalLoadingState loading={isLoading} error={error} />+ </TimelineModal>);}return (- <MoveTimelineModal {...props} timeline={timeline} onSubmit={handleSubmit} />+ <MoveTimelineModal+ timeline={timeline}+ onSubmit={handleSubmit}+ onClose={onClose}+ />);}diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsxindex d251b1403dc..303f8767ee2 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx@@ -1,3 +1,5 @@+import { t } from "ttag";+import {skipToken,useCreateTimelineEventMutation,@@ -5,7 +7,11 @@ import {} from "metabase/api";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";import { useNavigate } from "metabase/router";-import NewEventModal from "metabase/timelines/common/components/NewEventModal";+import NewEventForm from "metabase/timelines/common/components/NewEventForm";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type {CreateTimelineEventRequest,@@ -13,8 +19,6 @@ import type {TimelineEvent,} from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-function NewEventModalContainer({ params, onClose }: ModalComponentProps) {const navigate = useNavigate();const [createTimelineEvent] = useCreateTimelineEventMutation();@@ -25,12 +29,6 @@ function NewEventModalContainer({ params, onClose }: ModalComponentProps) {error,} = useGetTimelineQuery(id != null ? { id, include: "events" } : skipToken);- if (isLoading || error || !timeline) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }-const onSubmit = async (values: Partial<TimelineEvent>,_collection?: unknown,@@ -44,12 +42,24 @@ function NewEventModalContainer({ params, onClose }: ModalComponentProps) {};return (- <NewEventModal- source="collections"- timelines={[timeline]}- onSubmit={onSubmit}+ <TimelineModal+ title={t`New event`}onClose={onClose}- />+ animated={false}+ density="relaxed"+ tall={isLoading || !!error || !timeline}+ >+ {isLoading || error || !timeline ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <NewEventForm+ source="collections"+ timelines={[timeline]}+ onSubmit={onSubmit}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsxindex 6ff4f18ed63..c9035a0f97e 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx@@ -1,3 +1,5 @@+import { t } from "ttag";+import {skipToken,useCreateTimelineEventMutation,@@ -6,25 +8,29 @@ import {} from "metabase/api";import { getDefaultTimeline } from "metabase/common/utils/timelines";import { useNavigate } from "metabase/router";-import NewEventModal from "metabase/timelines/common/components/NewEventModal";+import NewEventForm from "metabase/timelines/common/components/NewEventForm";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type { Collection, TimelineEventData } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import type { ModalParams } from "../../types";interface NewEventWithTimelineModalContainerProps {params: ModalParams;- onClose?: () => void;+ onClose: () => void;}-function NewEventWithTimelineModalContainer(- props: NewEventWithTimelineModalContainerProps,-) {+function NewEventWithTimelineModalContainer({+ params,+ onClose,+}: NewEventWithTimelineModalContainerProps) {const navigate = useNavigate();const [createTimeline] = useCreateTimelineMutation();const [createTimelineEvent] = useCreateTimelineEventMutation();- const collectionId = Urls.extractCollectionId(props.params.slug);+ const collectionId = Urls.extractCollectionId(params.slug);const {data: collection,isLoading,@@ -50,17 +56,25 @@ function NewEventWithTimelineModalContainer(navigate(Urls.timelinesInCollection(collection));};- if (isLoading || error || !collection) {- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;- }-return (- <NewEventModal- {...props}- source="collections"- collection={collection}- onSubmit={onSubmit}- />+ <TimelineModal+ title={t`New event`}+ onClose={onClose}+ animated={false}+ density="relaxed"+ tall={isLoading || !!error || !collection}+ >+ {isLoading || error || !collection ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <NewEventForm+ source="collections"+ collection={collection}+ onSubmit={onSubmit}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsxindex 8989dee5419..24c2fb7be0b 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx@@ -1,25 +1,33 @@+import { t } from "ttag";+import {skipToken,useCreateTimelineMutation,useGetCollectionQuery,} from "metabase/api";import { useNavigate } from "metabase/router";-import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";+import NewTimelineForm from "metabase/timelines/common/components/NewTimelineForm";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import * as Urls from "metabase/urls";import type { CreateTimelineRequest, Timeline } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import type { ModalParams } from "../../types";interface NewTimelineModalContainerProps {params: ModalParams;- onClose?: () => void;+ onClose: () => void;}-function NewTimelineModalContainer(props: NewTimelineModalContainerProps) {+function NewTimelineModalContainer({+ params,+ onClose,+}: NewTimelineModalContainerProps) {const navigate = useNavigate();const [createTimeline] = useCreateTimelineMutation();- const collectionId = Urls.extractCollectionId(props.params.slug);+ const collectionId = Urls.extractCollectionId(params.slug);const {data: collection,isLoading,@@ -36,12 +44,24 @@ function NewTimelineModalContainer(props: NewTimelineModalContainerProps) {navigate(Urls.timelineInCollection({ ...timeline, collection }));};- if (isLoading || error || !collection) {- return <LoadingAndErrorWrapper loading={isLoading} error={error} />;- }-return (- <NewTimelineModal {...props} collection={collection} onSubmit={onSubmit} />+ <TimelineModal+ title={t`New event timeline`}+ onClose={onClose}+ animated={false}+ density="relaxed"+ tall={isLoading || !!error || !collection}+ >+ {isLoading || error || !collection ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <NewTimelineForm+ collection={collection}+ onSubmit={onSubmit}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.unit.spec.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.unit.spec.tsxindex abc7786447f..a5b7ba41af1 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.unit.spec.tsx@@ -29,7 +29,12 @@ function setup() {<Route path="collection/:slug"><Routepath="timelines/new"- element={<NewTimelineModal params={{ slug: "7-launches" }} />}+ element={+ <NewTimelineModal+ params={{ slug: "7-launches" }}+ onClose={jest.fn()}+ />+ }/><Route path="timelines/:timelineId" element={<div>Timeline page</div>} /></Route>,diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsxindex db73079942e..7677e864f4d 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx@@ -1,3 +1,5 @@+import { t } from "ttag";+import { skipToken, useGetTimelineQuery } from "metabase/api";import { useSetArchive } from "metabase/archive/hooks";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";@@ -5,13 +7,11 @@ import { useNavigate } from "metabase/router";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import TimelineDetailsModal from "../../components/TimelineDetailsModal";+import TimelineDetailsContent from "../../components/TimelineDetailsContent";+import { TimelineQueryModal } from "../../components/TimelineQueryModal";+import { getTimelineDetailsHeaderProps } from "../../utils/timeline-details-header";-function TimelineArchiveModalContainer({- params,- ...props-}: ModalComponentProps) {+function TimelineArchiveModal({ params, onClose }: ModalComponentProps) {const navigate = useNavigate();const archive = useSetArchive();const id = Urls.extractEntityId(params.timelineId);@@ -23,12 +23,6 @@ function TimelineArchiveModalContainer({id != null ? { id, include: "events", archived: true } : skipToken,);- if (isLoading || error || !timeline) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }-const handleUnarchive = (event: TimelineEvent) =>archive({ id: event.id, model: "timeline-event" }, false);@@ -37,15 +31,29 @@ function TimelineArchiveModalContainer({};return (- <TimelineDetailsModal- {...props}- timeline={timeline}- isArchive- onUnarchive={handleUnarchive}- onGoBack={handleGoBack}- />+ <TimelineQueryModal+ data={timeline}+ isLoading={isLoading}+ error={error}+ loadingTitle={t`Archived events`}+ getHeaderProps={(timeline) =>+ getTimelineDetailsHeaderProps(timeline, {+ isArchive: true,+ onGoBack: handleGoBack,+ })+ }+ onClose={onClose}+ >+ {(timeline) => (+ <TimelineDetailsContent+ timeline={timeline}+ isArchive+ onUnarchive={handleUnarchive}+ />+ )}+ </TimelineQueryModal>);}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineArchiveModalContainer;+export default TimelineArchiveModal;diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsxindex de5172d20d0..5ae2c78e8f7 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -8,19 +8,17 @@ import { useNavigate } from "metabase/router";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import TimelineDetailsModal from "../../components/TimelineDetailsModal";+import TimelineDetailsContent from "../../components/TimelineDetailsContent";+import { TimelineQueryModal } from "../../components/TimelineQueryModal";import type { ModalParams } from "../../types";+import { getTimelineDetailsHeaderProps } from "../../utils/timeline-details-header";-interface TimelineDetailsModalContainerProps {+interface TimelineDetailsModalProps {params: ModalParams;- onClose?: () => void;+ onClose: () => void;}-function TimelineDetailsModalContainer({- params,- ...props-}: TimelineDetailsModalContainerProps) {+function TimelineDetailsModal({ params, onClose }: TimelineDetailsModalProps) {const navigate = useNavigate();const archive = useSetArchive();const id = Urls.extractEntityId(params.timelineId);@@ -41,12 +39,6 @@ function TimelineDetailsModalContainer({const isLoading = isTimelineLoading || isTimelinesLoading;const error = timelineError ?? timelinesError;- if (isLoading || error || !timeline) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }-const handleArchive = (event: TimelineEvent) =>archive({ id: event.id, model: "timeline-event" }, true);@@ -55,15 +47,24 @@ function TimelineDetailsModalContainer({};return (- <TimelineDetailsModal- {...props}- timeline={timeline}- isOnlyTimeline={timelines.length <= 1}- onArchive={handleArchive}- onGoBack={handleGoBack}- />+ <TimelineQueryModal+ data={timeline}+ isLoading={isLoading}+ error={error}+ getHeaderProps={(timeline) =>+ getTimelineDetailsHeaderProps(timeline, {+ isOnlyTimeline: timelines.length <= 1,+ onGoBack: handleGoBack,+ })+ }+ onClose={onClose}+ >+ {(timeline) => (+ <TimelineDetailsContent timeline={timeline} onArchive={handleArchive} />+ )}+ </TimelineQueryModal>);}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineDetailsModalContainer;+export default TimelineDetailsModal;diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsxindex 2dc39d09fc5..6f888f2abbe 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx@@ -1,38 +1,97 @@-import { skipToken, useListCollectionTimelinesQuery } from "metabase/api";+import {+ skipToken,+ useGetCollectionQuery,+ useListCollectionTimelinesQuery,+} from "metabase/api";+import { useSetArchive } from "metabase/archive/hooks";import * as Urls from "metabase/urls";+import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import TimelineIndexModal from "../../components/TimelineIndexModal";+import TimelineDetailsContent from "../../components/TimelineDetailsContent";+import TimelineListContent from "../../components/TimelineListContent";+import { TimelineQueryModal } from "../../components/TimelineQueryModal";import type { ModalParams } from "../../types";+import { getTimelineDetailsHeaderProps } from "../../utils/timeline-details-header";+import { getTimelineListHeaderProps } from "../../utils/timeline-list-header";-interface TimelineIndexModalContainerProps {+interface TimelineIndexModalProps {params: ModalParams;- onClose?: () => void;+ onClose: () => void;}-function TimelineIndexModalContainer({- params,- ...props-}: TimelineIndexModalContainerProps) {+function TimelineIndexModal({ params, onClose }: TimelineIndexModalProps) {+ const archive = useSetArchive();const collectionId = Urls.extractCollectionId(params.slug);const {data: timelines = [],- isLoading,- error,+ isLoading: isTimelinesLoading,+ error: timelinesError,} = useListCollectionTimelinesQuery(collectionId != null ? { id: collectionId, include: "events" } : skipToken,);+ const {+ data: collection,+ isLoading: isCollectionLoading,+ error: collectionError,+ } = useGetCollectionQuery(+ collectionId != null ? { id: collectionId } : skipToken,+ );++ const isLoading = isTimelinesLoading || isCollectionLoading;+ const error = timelinesError ?? collectionError;- if (isLoading || error) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }+ const handleArchive = (event: TimelineEvent) =>+ archive({ id: event.id, model: "timeline-event" }, true);return (- <TimelineIndexModal {...props} params={params} timelines={timelines} />+ <TimelineQueryModal+ data={collection}+ isLoading={isLoading}+ error={error}+ getHeaderProps={(collection) => getHeaderProps(timelines, collection)}+ onClose={onClose}+ >+ {(collection) => (+ <TimelineIndexContent+ timelines={timelines}+ collection={collection}+ onArchive={handleArchive}+ />+ )}+ </TimelineQueryModal>);}+const getOnlyTimeline = (timelines: Timeline[]) =>+ timelines.length === 1 ? timelines[0] : undefined;++const getHeaderProps = (timelines: Timeline[], collection: Collection) => {+ const onlyTimeline = getOnlyTimeline(timelines);++ return onlyTimeline+ ? getTimelineDetailsHeaderProps(onlyTimeline, { isOnlyTimeline: true })+ : getTimelineListHeaderProps(timelines, collection);+};++interface TimelineIndexContentProps {+ timelines: Timeline[];+ collection: Collection;+ onArchive: (event: TimelineEvent) => void;+}++const TimelineIndexContent = ({+ timelines,+ collection,+ onArchive,+}: TimelineIndexContentProps) => {+ const onlyTimeline = getOnlyTimeline(timelines);++ return onlyTimeline ? (+ <TimelineDetailsContent timeline={onlyTimeline} onArchive={onArchive} />+ ) : (+ <TimelineListContent timelines={timelines} collection={collection} />+ );+};+// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineIndexModalContainer;+export default TimelineIndexModal;diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.unit.spec.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.unit.spec.tsxnew file mode 100644index 00000000000..2d177fcb178--- /dev/null+++ b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.unit.spec.tsx@@ -0,0 +1,84 @@+import {+ setupCollectionByIdEndpoint,+ setupCollectionTimelinesEndpoint,+} from "__support__/server-mocks";+import { act, renderWithProviders, screen } from "__support__/ui";+import { Api } from "metabase/api";+import type { Timeline } from "metabase-types/api";+import {+ createMockCollection,+ createMockTimeline,+ createMockTimelineEvent,+} from "metabase-types/api/mocks";++import TimelineIndexModal from "./TimelineIndexModal";++const collection = createMockCollection({ id: 7, name: "Launches" });++const releases = createMockTimeline({+ id: 1,+ name: "Releases",+ collection,+ events: [createMockTimelineEvent({ id: 1, name: "RC1" })],+});++const incidents = createMockTimeline({+ id: 2,+ name: "Incidents",+ collection,+ events: [],+});++interface SetupOpts {+ timelines: Timeline[];+}++function setup({ timelines }: SetupOpts) {+ let currentTimelines = timelines;+ setupCollectionByIdEndpoint({ collections: [collection] });+ setupCollectionTimelinesEndpoint(collection.id, async () => currentTimelines);++ const { store } = renderWithProviders(+ <TimelineIndexModal+ params={{ slug: "7-launches" }}+ onClose={jest.fn<void, []>()}+ />,+ );++ const setTimelines = (timelines: Timeline[]) => {+ currentTimelines = timelines;+ act(() => {+ store.dispatch(Api.util.invalidateTags(["timeline"]));+ });+ };++ return { setTimelines };+}++describe("TimelineIndexModal", () => {+ it("shows the details of a collection's only timeline", async () => {+ setup({ timelines: [releases] });++ expect(+ await screen.findByRole("heading", { name: "Releases" }),+ ).toBeInTheDocument();+ expect(screen.getByText("RC1")).toBeInTheDocument();+ });++ it("keeps one modal mounted while it loads and when the collection is left with one timeline", async () => {+ const { setTimelines } = setup({ timelines: [releases, incidents] });+ const dialog = screen.getByRole("dialog");++ expect(+ await screen.findByRole("heading", { name: "Events" }),+ ).toBeInTheDocument();+ expect(screen.getByRole("dialog")).toBe(dialog);++ setTimelines([releases]);++ expect(+ await screen.findByRole("heading", { name: "Releases" }),+ ).toBeInTheDocument();+ expect(screen.getByRole("dialog")).toBe(dialog);+ });+});diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsxindex 6d60808072e..0299e7b8d00 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx@@ -1,3 +1,5 @@+import { t } from "ttag";+import {skipToken,useGetCollectionQuery,@@ -8,19 +10,20 @@ import { useNavigate } from "metabase/router";import * as Urls from "metabase/urls";import type { Collection, Timeline } from "metabase-types/api";-import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import TimelineListModal from "../../components/TimelineListModal";+import TimelineListContent from "../../components/TimelineListContent";+import { TimelineQueryModal } from "../../components/TimelineQueryModal";import type { ModalParams } from "../../types";+import { getTimelineListHeaderProps } from "../../utils/timeline-list-header";-interface TimelineListArchiveModalContainerProps {+interface TimelineListArchiveModalProps {params: ModalParams;- onClose?: () => void;+ onClose: () => void;}-function TimelineListArchiveModalContainer({+function TimelineListArchiveModal({params,- ...props-}: TimelineListArchiveModalContainerProps) {+ onClose,+}: TimelineListArchiveModalProps) {const navigate = useNavigate();const archive = useSetArchive();const collectionId = Urls.extractCollectionId(params.slug);@@ -44,12 +47,6 @@ function TimelineListArchiveModalContainer({const isLoading = isTimelinesLoading || isCollectionLoading;const error = timelinesError ?? collectionError;- if (isLoading || error || !collection) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }-const onUnarchive = (timeline: Timeline) =>archive({ id: timeline.id, model: "timeline" }, false);@@ -58,16 +55,30 @@ function TimelineListArchiveModalContainer({};return (- <TimelineListModal- {...props}- collection={collection}- timelines={timelines}- isArchive- onUnarchive={onUnarchive}- onGoBack={onGoBack}- />+ <TimelineQueryModal+ data={collection}+ isLoading={isLoading}+ error={error}+ loadingTitle={t`Archived timelines`}+ getHeaderProps={(collection) =>+ getTimelineListHeaderProps(timelines, collection, {+ isArchive: true,+ onGoBack,+ })+ }+ onClose={onClose}+ >+ {(collection) => (+ <TimelineListContent+ timelines={timelines}+ collection={collection}+ isArchive+ onUnarchive={onUnarchive}+ />+ )}+ </TimelineQueryModal>);}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineListArchiveModalContainer;+export default TimelineListArchiveModal;diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsxdeleted file mode 100644index 49a2eb62369..00000000000--- a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx+++ /dev/null@@ -1,56 +0,0 @@-import {- skipToken,- useGetCollectionQuery,- useListCollectionTimelinesQuery,-} from "metabase/api";-import * as Urls from "metabase/urls";--import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import TimelineListModal from "../../components/TimelineListModal";-import type { ModalParams } from "../../types";--interface TimelineListModalContainerProps {- params: ModalParams;- onClose?: () => void;-}--function TimelineListModalContainer({- params,- ...props-}: TimelineListModalContainerProps) {- const collectionId = Urls.extractCollectionId(params.slug);- const {- data: timelines = [],- isLoading: isTimelinesLoading,- error: timelinesError,- } = useListCollectionTimelinesQuery(- collectionId != null ? { id: collectionId, include: "events" } : skipToken,- );- const {- data: collection,- isLoading: isCollectionLoading,- error: collectionError,- } = useGetCollectionQuery(- collectionId != null ? { id: collectionId } : skipToken,- );-- const isLoading = isTimelinesLoading || isCollectionLoading;- const error = timelinesError ?? collectionError;-- if (isLoading || error || !collection) {- return (- <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />- );- }-- return (- <TimelineListModal- {...props}- collection={collection}- timelines={timelines}- />- );-}--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default TimelineListModalContainer;diff --git a/frontend/src/metabase/timelines/collections/routes.tsx b/frontend/src/metabase/timelines/collections/routes.tsxindex a3bf0fc786c..d5aac0ea4a4 100644--- a/frontend/src/metabase/timelines/collections/routes.tsx+++ b/frontend/src/metabase/timelines/collections/routes.tsx@@ -1,32 +1,19 @@-import cx from "classnames";-import {type ModalComponent,type ModalRouteOptions,createModalRouteComponent,} from "metabase/common/components/ModalRoute";-import CS from "metabase/css/core/index.css";import type { RouteObject } from "metabase/router";-import { NO_ANIMATION_MODAL_PROPS } from "metabase/ui";/*** The timeline modals, in one chunk. They open over a collection, and every one* of them is reached from this list alone, so one name keeps the whole set to a* single request.+ *+ * Each one renders its own modal, so the routes don't wrap them in one. The+ * timeline and event modals open without transitions, so moving between them+ * swaps one for the next rather than animating.*/-const options = { modalProps: NO_ANIMATION_MODAL_PROPS };--/** The list and details modals scroll their own body: the dialog hands its height down, and the body clips rather than scrolls. */-const listOptions = {- modalProps: {- ...NO_ANIMATION_MODAL_PROPS,- classNames: {- content: cx(CS.flex, CS.flexColumn),- body: cx(CS.flex, CS.flexColumn, CS.overflowHidden),- },- },-};-const timelineIndexModal = () =>import(/* webpackChunkName: "timelines" */ "./containers/TimelineIndexModal"@@ -94,10 +81,13 @@ const deleteEventModal = () =>function lazyComponent(loadModal: () => Promise<ModalComponent>,- options: ModalRouteOptions = {},+ options: Omit<ModalRouteOptions, "noWrap" | "modalProps"> = {},) {return async () => ({- Component: createModalRouteComponent(await loadModal(), options),+ Component: createModalRouteComponent(await loadModal(), {+ ...options,+ noWrap: true,+ }),});}@@ -108,70 +98,62 @@ export function getCollectionTimelineRoutes(): RouteObject[] {children: [{index: true,- lazy: lazyComponent(timelineIndexModal, listOptions),+ lazy: lazyComponent(timelineIndexModal),},{path: "new",- lazy: lazyComponent(newTimelineModal, options),+ lazy: lazyComponent(newTimelineModal),},{path: "new/events/new",- lazy: lazyComponent(newEventWithTimelineModal, options),+ lazy: lazyComponent(newEventWithTimelineModal),},{path: "archive",- lazy: lazyComponent(timelineListArchiveModal, listOptions),+ lazy: lazyComponent(timelineListArchiveModal),},{path: ":timelineId",children: [{index: true,- lazy: lazyComponent(timelineDetailsModal, {- ...listOptions,- closeTo: "../..",- }),+ lazy: lazyComponent(timelineDetailsModal, { closeTo: "../.." }),},{path: "edit",- lazy: lazyComponent(editTimelineModal, options),+ lazy: lazyComponent(editTimelineModal),},{path: "move",- lazy: lazyComponent(moveTimelineModal, {- ...options,- noWrap: true,- }),+ lazy: lazyComponent(moveTimelineModal),},{path: "archive",- lazy: lazyComponent(timelineArchiveModal, listOptions),+ lazy: lazyComponent(timelineArchiveModal),},{path: "delete",// Opened from `timelines/archive`lazy: lazyComponent(deleteTimelineModal, {- ...options,closeTo: "../../archive",}),},{path: "events/new",- lazy: lazyComponent(newEventModal, options),+ lazy: lazyComponent(newEventModal),},{path: "events/:timelineEventId/edit",- lazy: lazyComponent(editEventModal, options),+ lazy: lazyComponent(editEventModal),},{path: "events/:timelineEventId/move",- lazy: lazyComponent(moveEventModal, options),+ lazy: lazyComponent(moveEventModal),},{path: "events/:timelineEventId/delete",// Opened from `:timelineId/archive`lazy: lazyComponent(deleteEventModal, {- ...options,closeTo: "../archive",}),},diff --git a/frontend/src/metabase/timelines/collections/routes.unit.spec.tsx b/frontend/src/metabase/timelines/collections/routes.unit.spec.tsxindex 419acf7f48a..6a103d7347b 100644--- a/frontend/src/metabase/timelines/collections/routes.unit.spec.tsx+++ b/frontend/src/metabase/timelines/collections/routes.unit.spec.tsx@@ -109,6 +109,10 @@ describe("collection timeline routes", () => {])("closes from $from to $to", async ({ from, to }) => {const { pathname } = setup(from);+ // Each modal renders its own dialog, so the route must not add another+ await screen.findByRole("button", { name: "Close" });+ expect(screen.queryByRole("dialog")).not.toBeInTheDocument();+await close();expect(pathname()).toBe(to);diff --git a/frontend/src/metabase/timelines/collections/utils/timeline-details-header.tsx b/frontend/src/metabase/timelines/collections/utils/timeline-details-header.tsxnew file mode 100644index 00000000000..f6d78c86a83--- /dev/null+++ b/frontend/src/metabase/timelines/collections/utils/timeline-details-header.tsx@@ -0,0 +1,80 @@+import { t } from "ttag";++import { getTimelineName } from "metabase/common/utils/timelines";+import type {+ TimelineModalHeaderProps,+ TimelineModalMenuItem,+} from "metabase/timelines/common/components/TimelineModalHeader";+import * as Urls from "metabase/urls";+import type { Timeline } from "metabase-types/api";++type TimelineDetailsHeaderOptions = {+ isArchive?: boolean;+ isOnlyTimeline?: boolean;+ onGoBack?: (timeline: Timeline) => void;+};++/**+ * Header props for a timeline's events modal: its name (or "Archived events")+ * and "⋯" menu. The back button calls `onGoBack`, and isn't shown for a+ * collection's only timeline unless `isArchive`.+ */+export function getTimelineDetailsHeaderProps(+ timeline: Timeline,+ {+ isArchive = false,+ isOnlyTimeline = false,+ onGoBack,+ }: TimelineDetailsHeaderOptions = {},+): TimelineModalHeaderProps {+ const title = isArchive ? t`Archived events` : getTimelineName(timeline);+ const menuItems = getMenuItems(timeline, isArchive, isOnlyTimeline);+ const canGoBack = isArchive || !isOnlyTimeline;++ return {+ title,+ menu: { label: t`Timeline menu`, items: menuItems },+ onGoBack: canGoBack && onGoBack ? () => onGoBack(timeline) : undefined,+ };+}++const getMenuItems = (+ timeline: Timeline,+ isArchive: boolean,+ isOnlyTimeline: boolean,+) => {+ const items: TimelineModalMenuItem[] = [];++ if (timeline.collection?.can_write && !isArchive) {+ items.push(+ {+ label: t`New timeline`,+ to: Urls.newTimelineInCollection(timeline.collection),+ },+ {+ label: t`Edit timeline details`,+ to: Urls.editTimelineInCollection(timeline),+ },+ {+ label: t`Move timeline`,+ to: Urls.moveTimelineInCollection(timeline),+ },+ );+ }++ if (!isArchive) {+ items.push({+ label: t`View archived events`,+ to: Urls.timelineArchiveInCollection(timeline),+ });+ }++ if (isOnlyTimeline) {+ items.push({+ label: t`View archived timelines`,+ to: Urls.timelinesArchiveInCollection(timeline.collection),+ });+ }++ return items;+};diff --git a/frontend/src/metabase/timelines/collections/utils/timeline-details-header.unit.spec.tsx b/frontend/src/metabase/timelines/collections/utils/timeline-details-header.unit.spec.tsxnew file mode 100644index 00000000000..67fec0c9a09--- /dev/null+++ b/frontend/src/metabase/timelines/collections/utils/timeline-details-header.unit.spec.tsx@@ -0,0 +1,32 @@+import {+ createMockCollection,+ createMockTimeline,+} from "metabase-types/api/mocks";++import { getTimelineDetailsHeaderProps } from "./timeline-details-header";++describe("getTimelineDetailsHeaderProps", () => {+ it("should use the collection's name for default timelines", () => {+ const timeline = createMockTimeline({+ name: "Metrics events",+ default: true,+ collection: createMockCollection({ name: "Analytics" }),+ });++ expect(getTimelineDetailsHeaderProps(timeline).title).toBe(+ "Analytics events",+ );+ });++ it("should use the timeline's name for non-default timelines", () => {+ const timeline = createMockTimeline({+ name: "Metrics events",+ default: false,+ collection: createMockCollection({ name: "Analytics" }),+ });++ expect(getTimelineDetailsHeaderProps(timeline).title).toBe(+ "Metrics events",+ );+ });+});diff --git a/frontend/src/metabase/timelines/collections/utils/timeline-list-header.tsx b/frontend/src/metabase/timelines/collections/utils/timeline-list-header.tsxnew file mode 100644index 00000000000..5bf0d739119--- /dev/null+++ b/frontend/src/metabase/timelines/collections/utils/timeline-list-header.tsx@@ -0,0 +1,70 @@+import { t } from "ttag";++import { getDefaultTimelineName } from "metabase/common/utils/timelines";+import type {+ TimelineModalHeaderProps,+ TimelineModalMenuItem,+} from "metabase/timelines/common/components/TimelineModalHeader";+import * as Urls from "metabase/urls";+import type { Collection, Timeline } from "metabase-types/api";++type TimelineListHeaderOptions = {+ isArchive?: boolean;+ onGoBack?: (collection: Collection) => void;+};++/**+ * Header props for a collection's timelines modal: the title, the "⋯" menu and+ * the collection's name when it has timelines. The back button is only shown+ * with `isArchive` and calls `onGoBack`.+ */+export function getTimelineListHeaderProps(+ timelines: Timeline[],+ collection: Collection,+ { isArchive = false, onGoBack }: TimelineListHeaderOptions = {},+): TimelineModalHeaderProps {+ const title = getTitle(timelines, collection, isArchive);+ const menuItems = getMenuItems(collection, isArchive);+ const hasTimelines = timelines.length > 0;++ return {+ title,+ collectionName: hasTimelines ? collection.name : undefined,+ menu: { label: t`Timelines menu`, items: menuItems },+ onGoBack: isArchive && onGoBack ? () => onGoBack(collection) : undefined,+ };+}++const getTitle = (+ timelines: Timeline[],+ collection: Collection,+ isArchive: boolean,+) => {+ if (isArchive) {+ return t`Archived timelines`;+ } else if (timelines.length) {+ return t`Events`;+ } else {+ return getDefaultTimelineName(collection);+ }+};++const getMenuItems = (+ collection: Collection,+ isArchive: boolean,+): TimelineModalMenuItem[] => {+ if (!collection.can_write || isArchive) {+ return [];+ }++ return [+ {+ label: t`New timeline`,+ to: Urls.newTimelineInCollection(collection),+ },+ {+ label: t`View archived timelines`,+ to: Urls.timelinesArchiveInCollection(collection),+ },+ ];+};diff --git a/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/DeleteConfirmationFooter.tsx b/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/DeleteConfirmationFooter.tsxnew file mode 100644index 00000000000..95f1fc4fb29--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/DeleteConfirmationFooter.tsx@@ -0,0 +1,22 @@+import { t } from "ttag";++import { Button, Modal } from "metabase/ui";++export interface DeleteConfirmationFooterProps {+ onDelete: () => void;+ onCancel: () => void;+}++export const DeleteConfirmationFooter = ({+ onDelete,+ onCancel,+}: DeleteConfirmationFooterProps) => (+ <Modal.Footer>+ <Button onClick={onCancel}>{t`Cancel`}</Button>+ <Button+ variant="filled"+ color="negative"+ onClick={onDelete}+ >{t`Delete`}</Button>+ </Modal.Footer>+);diff --git a/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/DeleteConfirmationFooter.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/DeleteConfirmationFooter.unit.spec.tsxnew file mode 100644index 00000000000..c9f170987ab--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/DeleteConfirmationFooter.unit.spec.tsx@@ -0,0 +1,22 @@+import userEvent from "@testing-library/user-event";++import { render, screen } from "__support__/ui";++import { DeleteConfirmationFooter } from "./DeleteConfirmationFooter";++describe("DeleteConfirmationFooter", () => {+ it("should delete or cancel", async () => {+ const onDelete = jest.fn();+ const onCancel = jest.fn();++ render(+ <DeleteConfirmationFooter onDelete={onDelete} onCancel={onCancel} />,+ );++ await userEvent.click(screen.getByRole("button", { name: "Delete" }));+ expect(onDelete).toHaveBeenCalledTimes(1);++ await userEvent.click(screen.getByRole("button", { name: "Cancel" }));+ expect(onCancel).toHaveBeenCalledTimes(1);+ });+});diff --git a/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/index.ts b/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/index.tsnew file mode 100644index 00000000000..f7987b8eb9c--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/DeleteConfirmationFooter/index.ts@@ -0,0 +1,2 @@+export { DeleteConfirmationFooter } from "./DeleteConfirmationFooter";+export type { DeleteConfirmationFooterProps } from "./DeleteConfirmationFooter";diff --git a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsxdeleted file mode 100644index 7fbb6f702c9..00000000000--- a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx+++ /dev/null@@ -1,44 +0,0 @@-import { type JSX, useCallback } from "react";-import { t } from "ttag";--import { Button } from "metabase/ui";-import type { TimelineEvent } from "metabase-types/api";--import { ModalFooter } from "../ModalFooter";-import { ModalHeader } from "../ModalHeader";--export interface DeleteEventModalProps {- event: TimelineEvent;- onSubmit: (event: TimelineEvent) => void;- onSubmitSuccess?: () => void;- onClose?: () => void;-}--const DeleteEventModal = ({- event,- onSubmit,- onSubmitSuccess,- onClose,-}: DeleteEventModalProps): JSX.Element => {- const handleSubmit = useCallback(async () => {- await onSubmit(event);- onSubmitSuccess?.();- }, [event, onSubmit, onSubmitSuccess]);-- return (- <div>- <ModalHeader title={t`Delete ${event?.name}?`} onClose={onClose} />- <ModalFooter hasPadding>- <Button onClick={onClose}>{t`Cancel`}</Button>- <Button- variant="filled"- color="negative"- onClick={handleSubmit}- >{t`Delete`}</Button>- </ModalFooter>- </div>- );-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default DeleteEventModal;diff --git a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.unit.spec.tsxdeleted file mode 100644index 2d20aee835e..00000000000--- a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.unit.spec.tsx+++ /dev/null@@ -1,27 +0,0 @@-import userEvent from "@testing-library/user-event";--import { render, screen } from "__support__/ui";-import { createMockTimelineEvent } from "metabase-types/api/mocks";--import type { DeleteEventModalProps } from "./DeleteEventModal";-import DeleteEventModal from "./DeleteEventModal";--describe("DeleteEventModal", () => {- it("should submit modal", async () => {- const props = getProps();-- render(<DeleteEventModal {...props} />);- await userEvent.click(screen.getByText("Delete"));-- expect(props.onSubmit).toHaveBeenCalled();- });-});--const getProps = (- opts?: Partial<DeleteEventModalProps>,-): DeleteEventModalProps => ({- event: createMockTimelineEvent(),- onSubmit: jest.fn(),- onClose: jest.fn(),- ...opts,-});diff --git a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsxdeleted file mode 100644index 183152a595b..00000000000--- a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx+++ /dev/null@@ -1,42 +0,0 @@-import { type JSX, useCallback } from "react";-import { t } from "ttag";--import { Button } from "metabase/ui";-import type { Timeline } from "metabase-types/api";--import { ModalFooter } from "../ModalFooter";-import { ModalHeader } from "../ModalHeader";--export interface DeleteTimelineModalProps {- timeline: Timeline;- onSubmit: (timeline: Timeline) => void;- onSubmitSuccess?: () => void;- onClose?: () => void;-}--const DeleteTimelineModal = ({- timeline,- onSubmit,- onSubmitSuccess,- onClose,-}: DeleteTimelineModalProps): JSX.Element => {- const handleSubmit = useCallback(async () => {- await onSubmit(timeline);- onSubmitSuccess?.();- }, [timeline, onSubmit, onSubmitSuccess]);-- return (- <div>- <ModalHeader title={t`Delete ${timeline?.name}?`} onClose={onClose} />- <ModalFooter hasPadding>- <Button onClick={onClose}>{t`Cancel`}</Button>- <Button variant="filled" color="negative" onClick={handleSubmit}>- {t`Delete`}- </Button>- </ModalFooter>- </div>- );-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default DeleteTimelineModal;diff --git a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/index.ts b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/index.tsdeleted file mode 100644index 4d6265b5275..00000000000--- a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./DeleteTimelineModal";diff --git a/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/common/components/EditEventForm/EditEventForm.tsxsimilarity index 64%rename from frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsxrename to frontend/src/metabase/timelines/common/components/EditEventForm/EditEventForm.tsxindex fe64cc2d366..1587ddd66f9 100644--- a/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/EditEventForm/EditEventForm.tsx@@ -1,5 +1,4 @@import { type JSX, useCallback } from "react";-import { t } from "ttag";import type {Timeline,@@ -8,28 +7,26 @@ import type {} from "metabase-types/api";import EventForm from "../../containers/EventForm";-import ModalBody from "../ModalBody";-import { ModalHeader } from "../ModalHeader";-export interface EditEventModalProps {+export interface EditEventFormProps {event: TimelineEvent;timeline?: Timeline;onSubmit: (event: TimelineEvent, timeline?: Timeline) => void;onSubmitSuccess?: () => void;onArchive: (event: TimelineEvent, timeline?: Timeline) => void;onArchiveSuccess?: () => void;- onClose?: () => void;+ onCancel: () => void;}-const EditEventModal = ({+const EditEventForm = ({event,timeline,onSubmit,onSubmitSuccess,onArchive,onArchiveSuccess,- onClose,-}: EditEventModalProps): JSX.Element => {+ onCancel,+}: EditEventFormProps): JSX.Element => {const handleSubmit = useCallback(async (values: TimelineEventData) => {await onSubmit({ ...event, ...values }, timeline);@@ -44,19 +41,14 @@ const EditEventModal = ({}, [event, timeline, onArchive, onArchiveSuccess]);return (- <div>- <ModalHeader title={t`Edit event`} onClose={onClose} />- <ModalBody>- <EventForm- initialValues={event}- onSubmit={handleSubmit}- onArchive={handleArchive}- onCancel={onClose}- />- </ModalBody>- </div>+ <EventForm+ initialValues={event}+ onSubmit={handleSubmit}+ onArchive={handleArchive}+ onCancel={onCancel}+ />);};// eslint-disable-next-line import/no-default-export -- deprecated usage-export default EditEventModal;+export default EditEventForm;diff --git a/frontend/src/metabase/timelines/common/components/NewEventModal/index.ts b/frontend/src/metabase/timelines/common/components/EditEventForm/index.tssimilarity index 62%rename from frontend/src/metabase/timelines/common/components/NewEventModal/index.tsrename to frontend/src/metabase/timelines/common/components/EditEventForm/index.tsindex d2617f868e4..7cfc9080a07 100644--- a/frontend/src/metabase/timelines/common/components/NewEventModal/index.ts+++ b/frontend/src/metabase/timelines/common/components/EditEventForm/index.ts@@ -1,2 +1,2 @@// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./NewEventModal";+export { default } from "./EditEventForm";diff --git a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/EditTimelineForm/EditTimelineForm.tsxsimilarity index 59%rename from frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsxrename to frontend/src/metabase/timelines/common/components/EditTimelineForm/EditTimelineForm.tsxindex e6f3debbfe4..14875262eec 100644--- a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/EditTimelineForm/EditTimelineForm.tsx@@ -1,29 +1,26 @@import { type JSX, useCallback } from "react";-import { t } from "ttag";import type { Timeline, TimelineData } from "metabase-types/api";-import ModalBody from "../ModalBody";-import { ModalHeader } from "../ModalHeader";import { TimelineForm } from "../TimelineForm";-export interface EditTimelineModalProps {+export interface EditTimelineFormProps {timeline: Timeline;onSubmit: (values: Timeline) => void;onSubmitSuccess?: () => void;onArchive: (timeline: Timeline) => void;onArchiveSuccess?: () => void;- onClose?: () => void;+ onCancel: () => void;}-const EditTimelineModal = ({+const EditTimelineForm = ({timeline,onSubmit,onSubmitSuccess,onArchive,onArchiveSuccess,- onClose,-}: EditTimelineModalProps): JSX.Element => {+ onCancel,+}: EditTimelineFormProps): JSX.Element => {const handleSubmit = useCallback(async (values: TimelineData) => {await onSubmit({ ...timeline, ...values, default: false });@@ -38,19 +35,14 @@ const EditTimelineModal = ({}, [timeline, onArchive, onArchiveSuccess]);return (- <div>- <ModalHeader title={t`Edit event timeline`} onClose={onClose} />- <ModalBody>- <TimelineForm- initialValues={timeline}- onSubmit={handleSubmit}- onArchive={handleArchive}- onCancel={onClose}- />- </ModalBody>- </div>+ <TimelineForm+ initialValues={timeline}+ onSubmit={handleSubmit}+ onArchive={handleArchive}+ onCancel={onCancel}+ />);};// eslint-disable-next-line import/no-default-export -- deprecated usage-export default EditTimelineModal;+export default EditTimelineForm;diff --git a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/EditTimelineForm/EditTimelineForm.unit.spec.tsxsimilarity index 70%rename from frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.unit.spec.tsxrename to frontend/src/metabase/timelines/common/components/EditTimelineForm/EditTimelineForm.unit.spec.tsxindex e696fae9cd3..1a939014801 100644--- a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/EditTimelineForm/EditTimelineForm.unit.spec.tsx@@ -3,15 +3,15 @@ import userEvent from "@testing-library/user-event";import { render, screen, waitFor } from "__support__/ui";import { createMockTimeline } from "metabase-types/api/mocks";-import type { EditTimelineModalProps } from "./EditTimelineModal";-import EditTimelineModal from "./EditTimelineModal";+import type { EditTimelineFormProps } from "./EditTimelineForm";+import EditTimelineForm from "./EditTimelineForm";-describe("EditTimelineModal", () => {+describe("EditTimelineForm", () => {it("should submit modal", async () => {const props = getProps();const name = "Another timeline";- render(<EditTimelineModal {...props} />);+ render(<EditTimelineForm {...props} />);await userEvent.clear(screen.getByLabelText("Name"));await userEvent.type(screen.getByLabelText("Name"), name);await userEvent.click(screen.getByText("Update"));@@ -23,11 +23,11 @@ describe("EditTimelineModal", () => {});const getProps = (- opts?: Partial<EditTimelineModalProps>,-): EditTimelineModalProps => ({+ opts?: Partial<EditTimelineFormProps>,+): EditTimelineFormProps => ({timeline: createMockTimeline(),onSubmit: jest.fn(),onArchive: jest.fn(),- onClose: jest.fn(),+ onCancel: jest.fn(),...opts,});diff --git a/frontend/src/metabase/timelines/common/components/DeleteEventModal/index.ts b/frontend/src/metabase/timelines/common/components/EditTimelineForm/index.tssimilarity index 61%rename from frontend/src/metabase/timelines/common/components/DeleteEventModal/index.tsrename to frontend/src/metabase/timelines/common/components/EditTimelineForm/index.tsindex 10140dfed05..e3989ce6363 100644--- a/frontend/src/metabase/timelines/common/components/DeleteEventModal/index.ts+++ b/frontend/src/metabase/timelines/common/components/EditTimelineForm/index.ts@@ -1,2 +1,2 @@// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./DeleteEventModal";+export { default } from "./EditTimelineForm";diff --git a/frontend/src/metabase/timelines/common/components/EditTimelineModal/index.ts b/frontend/src/metabase/timelines/common/components/EditTimelineModal/index.tsdeleted file mode 100644index bd93d4a5b0a..00000000000--- a/frontend/src/metabase/timelines/common/components/EditTimelineModal/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./EditTimelineModal";diff --git a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsxindex 65d1f83e38e..3e5aff79819 100644--- a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx+++ b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx@@ -23,6 +23,7 @@ import {Flex,Group,Icon,+ Modal,Stack,TimeInput,} from "metabase/ui";@@ -114,11 +115,14 @@ const EventForm = ({>{({ dirty, values, setFieldValue }) => (<Form disabled={!dirty} data-testid="event-form">- <Stack>+ <Stack gap="xl"><FormTextInputname="name"label={t`Event name`}placeholder={t`Product launch`}+ // The form can mount after the modal opens (while loading), when the+ // modal no longer looks for `data-autofocus`+ autoFocusdata-autofocus/><Flex align="end" gap="lg">@@ -202,23 +206,23 @@ const EventForm = ({data={timelineOptions}/>)}- <Flex gap="lg" justify="end">- <FormErrorMessage inline />- {!isNew && (- <FormArchiveButton onClick={onArchive}>- {t`Archive event`}- </FormArchiveButton>- )}- <Button type="button" onClick={onCancel}>- {t`Cancel`}- </Button>- <FormSubmitButton- variant="filled"- disabled={!dirty}- label={isNew ? t`Create` : t`Update`}- />- </Flex></Stack>+ <Modal.Footer>+ <FormErrorMessage inline flex={1} />+ {!isNew && (+ <FormArchiveButton onClick={onArchive}>+ {t`Archive event`}+ </FormArchiveButton>+ )}+ <Button type="button" onClick={onCancel}>+ {t`Cancel`}+ </Button>+ <FormSubmitButton+ variant="filled"+ disabled={!dirty}+ label={isNew ? t`Create` : t`Update`}+ />+ </Modal.Footer></Form>)}</FormProvider>diff --git a/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.tsx b/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.tsxdeleted file mode 100644index f22b9b5d0a6..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.tsx+++ /dev/null@@ -1,13 +0,0 @@-import type { JSX, ReactNode } from "react";--import { Box } from "metabase/ui";-export interface ModalBodyProps {- children?: ReactNode;-}--const ModalBody = ({ children }: ModalBodyProps): JSX.Element => {- return <Box p="2rem">{children}</Box>;-};--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default ModalBody;diff --git a/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.tsx b/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.tsxdeleted file mode 100644index e74e422533d..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalFooter/ModalFooter.tsx+++ /dev/null@@ -1,25 +0,0 @@-import type { JSX, ReactNode } from "react";--import { Flex } from "metabase/ui";--export interface ModalFooterProps {- hasPadding?: boolean;- children?: ReactNode;-}--export const ModalFooter = ({- hasPadding,- children,-}: ModalFooterProps): JSX.Element => {- return (- <Flex- gap="lg"- justify="flex-end"- pt={hasPadding ? "xxl" : 0}- px="xxl"- pb="xxl"- >- {children}- </Flex>- );-};diff --git a/frontend/src/metabase/timelines/common/components/ModalFooter/index.ts b/frontend/src/metabase/timelines/common/components/ModalFooter/index.tsdeleted file mode 100644index 82f200817c1..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalFooter/index.ts+++ /dev/null@@ -1 +0,0 @@-export { ModalFooter } from "./ModalFooter";diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsxdeleted file mode 100644index deeffcfd215..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.tsx+++ /dev/null@@ -1,67 +0,0 @@-import cx from "classnames";-import type { JSX, ReactNode } from "react";-import { c, t } from "ttag";--import CS from "metabase/css/core/index.css";-import { ActionIcon, Box, Ellipsified, Flex, Group, Icon } from "metabase/ui";--export interface ModalHeaderProps {- title?: ReactNode;- children?: ReactNode;- onClose?: () => void;- onGoBack?: () => void;- pathOptions?: {- showPath: boolean;- collectionName: string;- };-}--export const ModalHeader = ({- title,- children,- onClose,- onGoBack,- pathOptions,-}: ModalHeaderProps): JSX.Element => {- const canGoBack = onGoBack !== undefined;-- return (- <Box p="xxl" pb={0}>- <Flex align="center">- <Flex- className={cx(CS.textDefault, {- [CS.cursorPointer]: canGoBack,- [CS.textBrandHover]: canGoBack,- })}- align="center"- miw={0}- mr="auto"- onClick={onGoBack}- >- {onGoBack && <Icon name="chevronleft" mr="sm" />}- <Ellipsified- tooltipProps={{ w: "auto" }}- fz="1.25rem"- lh="1.5rem"- fw="bold"- >- {title}- </Ellipsified>- </Flex>- {children}- {onClose && (- <ActionIcon variant="subtle" onClick={onClose} aria-label={t`Close`}>- <Icon name="close" />- </ActionIcon>- )}- </Flex>- {pathOptions?.showPath && (- <Group gap="xxs" align="center">- {c("Refers to: 'Events' in a collection").t`in`}- <Icon name="folder" c="text-disabled" />- {pathOptions.collectionName}- </Group>- )}- </Box>- );-};diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.unit.spec.tsxdeleted file mode 100644index 9c787aa78c1..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalHeader/ModalHeader.unit.spec.tsx+++ /dev/null@@ -1,44 +0,0 @@-import userEvent from "@testing-library/user-event";--import { render, screen } from "__support__/ui";--import { ModalHeader } from "./ModalHeader";--describe("ModalHeader", () => {- it("should render title", () => {- render(<ModalHeader title="Events" />);-- expect(screen.getByText("Events")).toBeInTheDocument();- expect(screen.queryByText("Foo")).not.toBeInTheDocument();- });-- it("should render title with path", () => {- const pathOptions = {- showPath: true,- collectionName: "Foo",- };-- render(<ModalHeader title="Events" pathOptions={pathOptions} />);-- expect(screen.getByText("Events")).toBeInTheDocument();- expect(screen.getByText(/^in.*Foo$/)).toBeInTheDocument();- });-- it("should render with actions", () => {- render(<ModalHeader title="Events">Actions</ModalHeader>);-- expect(screen.getByText("Actions")).toBeInTheDocument();- });-- it("should render with close button", async () => {- const onClose = jest.fn();-- render(<ModalHeader title="Events" onClose={onClose} />);-- const closeButton = screen.getByLabelText("close icon");- expect(closeButton).toBeInTheDocument();-- await userEvent.click(closeButton);- expect(onClose).toHaveBeenCalledTimes(1);- });-});diff --git a/frontend/src/metabase/timelines/common/components/ModalHeader/index.ts b/frontend/src/metabase/timelines/common/components/ModalHeader/index.tsdeleted file mode 100644index 67a633cd15f..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalHeader/index.ts+++ /dev/null@@ -1 +0,0 @@-export { ModalHeader } from "./ModalHeader";diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/common/components/MoveEventForm/MoveEventForm.tsxsimilarity index 65%rename from frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsxrename to frontend/src/metabase/timelines/common/components/MoveEventForm/MoveEventForm.tsxindex 850917b9d69..ce3349bcc5e 100644--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/MoveEventForm/MoveEventForm.tsx@@ -2,15 +2,13 @@ import { type JSX, useCallback, useMemo, useState } from "react";import { t } from "ttag";import { getSortedTimelines } from "metabase/common/utils/timelines";-import CS from "metabase/css/core/index.css";-import { Button, Stack } from "metabase/ui";+import { Button, Modal } from "metabase/ui";import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";-import { ModalFooter } from "../ModalFooter";-import { ModalHeader } from "../ModalHeader";+import { TimelineModalScrollArea } from "../TimelineModal";import { TimelinePicker } from "../TimelinePicker";-export interface MoveEventModalProps {+export interface MoveEventFormProps {event: TimelineEvent;timelines: Timeline[];collection?: Collection;@@ -20,17 +18,17 @@ export interface MoveEventModalProps {oldTimeline?: Timeline,) => void;onSubmitSuccess?: () => void;- onClose?: () => void;+ onCancel: () => void;}-export const MoveEventModal = ({+export const MoveEventForm = ({event,timelines,collection,onSubmit,onSubmitSuccess,- onClose,-}: MoveEventModalProps): JSX.Element => {+ onCancel,+}: MoveEventFormProps): JSX.Element => {const oldTimeline = timelines.find((t) => t.id === event.timeline_id);const [newTimeline, setNewTimeline] = useState(oldTimeline);const isEnabled = newTimeline?.id !== oldTimeline?.id;@@ -45,28 +43,20 @@ export const MoveEventModal = ({}, [event, newTimeline, oldTimeline, onSubmit, onSubmitSuccess]);return (- <Stack gap={0} mih="36rem" mah="90vh">- <ModalHeader title={t`Move ${event.name}`} onClose={onClose} />- <Stack- className={CS.overflowYAuto}- gap={0}- flex="1 1 auto"- my="lg"- py="lg"- px="xxl"- >+ <>+ <TimelineModalScrollArea><TimelinePickervalue={newTimeline}options={sortedTimelines}onChange={setNewTimeline}/>- </Stack>- <ModalFooter>- <Button onClick={onClose}>{t`Cancel`}</Button>+ </TimelineModalScrollArea>+ <Modal.Footer>+ <Button onClick={onCancel}>{t`Cancel`}</Button><Button variant="filled" disabled={!isEnabled} onClick={handleSubmit}>{t`Move`}</Button>- </ModalFooter>- </Stack>+ </Modal.Footer>+ </>);};diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/MoveEventForm/MoveEventForm.unit.spec.tsxsimilarity index 76%rename from frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsxrename to frontend/src/metabase/timelines/common/components/MoveEventForm/MoveEventForm.unit.spec.tsxindex 638cddae4ab..36a5c9dc120 100644--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/MoveEventForm/MoveEventForm.unit.spec.tsx@@ -6,10 +6,10 @@ import {createMockTimelineEvent,} from "metabase-types/api/mocks";-import type { MoveEventModalProps } from "./MoveEventModal";-import { MoveEventModal } from "./MoveEventModal";+import type { MoveEventFormProps } from "./MoveEventForm";+import { MoveEventForm } from "./MoveEventForm";-describe("MoveEventModal", () => {+describe("MoveEventForm", () => {it("should move an event to a different timeline", async () => {const event = createMockTimelineEvent({ timeline_id: 1 });const oldTimeline = createMockTimeline({ id: 1, name: "Builds" });@@ -20,7 +20,7 @@ describe("MoveEventModal", () => {timelines: [oldTimeline, newTimeline],});- render(<MoveEventModal {...props} />);+ render(<MoveEventForm {...props} />);expect(screen.getByRole("button", { name: "Move" })).toBeDisabled();await userEvent.click(screen.getByText(newTimeline.name));@@ -33,12 +33,10 @@ describe("MoveEventModal", () => {});});-const getProps = (- opts?: Partial<MoveEventModalProps>,-): MoveEventModalProps => ({+const getProps = (opts?: Partial<MoveEventFormProps>): MoveEventFormProps => ({event: createMockTimelineEvent(),timelines: [],onSubmit: jest.fn(),- onClose: jest.fn(),+ onCancel: jest.fn(),...opts,});diff --git a/frontend/src/metabase/timelines/common/components/MoveEventForm/index.ts b/frontend/src/metabase/timelines/common/components/MoveEventForm/index.tsnew file mode 100644index 00000000000..ac4e20dd30d--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/MoveEventForm/index.ts@@ -0,0 +1,2 @@+export { MoveEventForm } from "./MoveEventForm";+export type { MoveEventFormProps } from "./MoveEventForm";diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/index.ts b/frontend/src/metabase/timelines/common/components/MoveEventModal/index.tsdeleted file mode 100644index 45cf5afa727..00000000000--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export { MoveEventModal } from "./MoveEventModal";-export type { MoveEventModalProps } from "./MoveEventModal";diff --git a/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/common/components/NewEventForm/NewEventForm.tsxsimilarity index 78%rename from frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsxrename to frontend/src/metabase/timelines/common/components/NewEventForm/NewEventForm.tsxindex d3bbf0e8545..ce916c277d9 100644--- a/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/NewEventForm/NewEventForm.tsx@@ -1,7 +1,5 @@import { type JSX, useCallback, useMemo } from "react";-import { t } from "ttag";-import { ModalContent } from "metabase/common/components/ModalContent";import { getDefaultTimelineIcon } from "metabase/common/utils/timelines";import { dayjs } from "metabase/dayjs";import type {@@ -13,7 +11,7 @@ import type {import EventForm from "../../containers/EventForm";-export interface NewEventModalProps {+export interface NewEventFormProps {timelines?: Timeline[];collection?: Collection;source: TimelineEventSource;@@ -24,18 +22,18 @@ export interface NewEventModalProps {timeline?: Timeline,) => void;onSubmitSuccess?: () => void;- onClose?: () => void;+ onCancel: () => void;}-const NewEventModal = ({+const NewEventForm = ({timelines = [],collection,source,cardId,onSubmit,onSubmitSuccess,- onClose,-}: NewEventModalProps): JSX.Element => {+ onCancel,+}: NewEventFormProps): JSX.Element => {const availableTimelines = useMemo(() => {return timelines.filter((t) => t.collection?.can_write);}, [timelines]);@@ -54,14 +52,12 @@ const NewEventModal = ({);return (- <ModalContent onClose={onClose} formModal title={t`New event`}>- <EventForm- initialValues={initialValues}- timelines={availableTimelines}- onSubmit={handleSubmit}- onCancel={onClose}- />- </ModalContent>+ <EventForm+ initialValues={initialValues}+ timelines={availableTimelines}+ onSubmit={handleSubmit}+ onCancel={onCancel}+ />);};@@ -88,4 +84,4 @@ const getInitialValues = (};// eslint-disable-next-line import/no-default-export -- deprecated usage-export default NewEventModal;+export default NewEventForm;diff --git a/frontend/src/metabase/timelines/common/components/ModalBody/index.ts b/frontend/src/metabase/timelines/common/components/NewEventForm/index.tssimilarity index 63%rename from frontend/src/metabase/timelines/common/components/ModalBody/index.tsrename to frontend/src/metabase/timelines/common/components/NewEventForm/index.tsindex d35fffce19e..999600075de 100644--- a/frontend/src/metabase/timelines/common/components/ModalBody/index.ts+++ b/frontend/src/metabase/timelines/common/components/NewEventForm/index.ts@@ -1,2 +1,2 @@// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./ModalBody";+export { default } from "./NewEventForm";diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/NewTimelineForm/NewTimelineForm.tsxsimilarity index 69%rename from frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsxrename to frontend/src/metabase/timelines/common/components/NewTimelineForm/NewTimelineForm.tsxindex c94e28b8a8e..9c0268b3a60 100644--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/NewTimelineForm/NewTimelineForm.tsx@@ -1,26 +1,24 @@import { type JSX, useCallback, useMemo } from "react";-import { t } from "ttag";import { canonicalCollectionId } from "metabase/common/collections/utils";-import { ModalContent } from "metabase/common/components/ModalContent";import { getDefaultTimelineIcon } from "metabase/common/utils/timelines";import type { Collection, TimelineData } from "metabase-types/api";import { TimelineForm } from "../TimelineForm";-export interface NewTimelineModalProps {+export interface NewTimelineFormProps {collection: Collection;onSubmit: (values: TimelineData, collection: Collection) => void;onSubmitSuccess?: () => void;- onClose?: () => void;+ onCancel: () => void;}-const NewTimelineModal = ({+const NewTimelineForm = ({collection,onSubmit,onSubmitSuccess,- onClose,-}: NewTimelineModalProps): JSX.Element => {+ onCancel,+}: NewTimelineFormProps): JSX.Element => {const initialValues = useMemo(() => {return getInitialValues(collection);}, [collection]);@@ -34,13 +32,11 @@ const NewTimelineModal = ({);return (- <ModalContent title={t`New event timeline`} onClose={onClose}>- <TimelineForm- initialValues={initialValues}- onSubmit={handleSubmit}- onCancel={onClose}- />- </ModalContent>+ <TimelineForm+ initialValues={initialValues}+ onSubmit={handleSubmit}+ onCancel={onCancel}+ />);};@@ -54,4 +50,4 @@ const getInitialValues = (collection: Collection): TimelineData => ({});// eslint-disable-next-line import/no-default-export -- deprecated usage-export default NewTimelineModal;+export default NewTimelineForm;diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/NewTimelineForm/NewTimelineForm.unit.spec.tsxsimilarity index 72%rename from frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.unit.spec.tsxrename to frontend/src/metabase/timelines/common/components/NewTimelineForm/NewTimelineForm.unit.spec.tsxindex 712625173b6..a570cc4a307 100644--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/NewTimelineForm/NewTimelineForm.unit.spec.tsx@@ -6,15 +6,15 @@ import {createMockTimelineData,} from "metabase-types/api/mocks";-import type { NewTimelineModalProps } from "./NewTimelineModal";-import NewTimelineModal from "./NewTimelineModal";+import type { NewTimelineFormProps } from "./NewTimelineForm";+import NewTimelineForm from "./NewTimelineForm";-describe("NewTimelineModal", () => {+describe("NewTimelineForm", () => {it("should submit modal", async () => {const props = getProps();const values = createMockTimelineData();- render(<NewTimelineModal {...props} />);+ render(<NewTimelineForm {...props} />);await userEvent.type(screen.getByLabelText("Name"), values.name);await waitFor(() => {expect(screen.getByText("Create")).toBeEnabled();@@ -28,10 +28,10 @@ describe("NewTimelineModal", () => {});const getProps = (- opts?: Partial<NewTimelineModalProps>,-): NewTimelineModalProps => ({+ opts?: Partial<NewTimelineFormProps>,+): NewTimelineFormProps => ({collection: createMockCollection(),onSubmit: jest.fn(),- onClose: jest.fn(),+ onCancel: jest.fn(),...opts,});diff --git a/frontend/src/metabase/timelines/common/components/EditEventModal/index.ts b/frontend/src/metabase/timelines/common/components/NewTimelineForm/index.tssimilarity index 61%rename from frontend/src/metabase/timelines/common/components/EditEventModal/index.tsrename to frontend/src/metabase/timelines/common/components/NewTimelineForm/index.tsindex 3a8c38e0e71..0a39c132662 100644--- a/frontend/src/metabase/timelines/common/components/EditEventModal/index.ts+++ b/frontend/src/metabase/timelines/common/components/NewTimelineForm/index.ts@@ -1,2 +1,2 @@// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./EditEventModal";+export { default } from "./NewTimelineForm";diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/index.ts b/frontend/src/metabase/timelines/common/components/NewTimelineModal/index.tsdeleted file mode 100644index e3d5b58050b..00000000000--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/index.ts+++ /dev/null@@ -1,2 +0,0 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./NewTimelineModal";diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/IconField.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/IconField.tsxindex 7c048e668c0..41f3b25cda8 100644--- a/frontend/src/metabase/timelines/common/components/TimelineForm/IconField.tsx+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/IconField.tsx@@ -17,12 +17,7 @@ export function IconField({const [{ value, onBlur }, { error, touched }, { setValue }] = useField(name);return (- <FormField- mb="lg"- title={title}- htmlFor={id}- error={touched ? error : undefined}- >+ <FormField title={title} htmlFor={id} error={touched ? error : undefined}><Selectid={id}name={name}diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsxindex 4c6fc96d817..ee0ca6feac6 100644--- a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx@@ -11,7 +11,7 @@ import {FormTextInput,FormTextarea,} from "metabase/forms";-import { Button, Flex } from "metabase/ui";+import { Button, Modal, Stack } from "metabase/ui";import * as Errors from "metabase/utils/errors";import type { TimelineData } from "metabase-types/api";@@ -49,23 +49,26 @@ export const TimelineForm = ({>{({ dirty }) => (<Form disabled={!dirty}>- <FormTextInput- name="name"- label={t`Name`}- placeholder={t`Product releases`}- autoFocus- mb="lg"- />- <FormTextarea- name="description"- label={t`Description`}- minRows={5}- mb="lg"- nullable- />- <IconField name="icon" title={t`Default icon`} options={icons} />- <Flex align="center" justify="flex-end" gap="sm">- <FormErrorMessage />+ <Stack gap="xl">+ <FormTextInput+ name="name"+ label={t`Name`}+ placeholder={t`Product releases`}+ // The form can mount after the modal opens (while loading), when the+ // modal no longer looks for `data-autofocus`+ autoFocus+ data-autofocus+ />+ <FormTextarea+ name="description"+ label={t`Description`}+ minRows={5}+ nullable+ />+ <IconField name="icon" title={t`Default icon`} options={icons} />+ </Stack>+ <Modal.Footer>+ <FormErrorMessage flex={1} />{!isNew && (<FormArchiveButton onClick={onArchive}>{t`Archive timeline and all events`}@@ -79,7 +82,7 @@ export const TimelineForm = ({disabled={!dirty}variant="filled"/>- </Flex>+ </Modal.Footer></Form>)}</FormProvider>diff --git a/frontend/src/metabase/timelines/common/components/TimelineModal/TimelineModal.module.css b/frontend/src/metabase/timelines/common/components/TimelineModal/TimelineModal.module.cssnew file mode 100644index 00000000000..0c4cd0026f5--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelineModal/TimelineModal.module.css@@ -0,0 +1,28 @@+/* For modals that keep their header and footer in place and scroll a list between them */+.content {+ display: flex;+ flex-direction: column;+ min-height: min(36rem, calc(100dvh - 2 * var(--modal-y-offset)));+}++.body {+ display: flex;+ flex: 1 1 auto;+ flex-direction: column;+ min-height: 0;+ overflow: hidden;+}++.scrollArea {+ display: flex;+ flex: 1 1 auto;+ flex-direction: column;+ min-height: 0;+ overflow-y: auto;+}++.loading {+ display: flex;+ flex: 1 1 auto;+ flex-direction: column;+}diff --git a/frontend/src/metabase/timelines/common/components/TimelineModal/TimelineModal.tsx b/frontend/src/metabase/timelines/common/components/TimelineModal/TimelineModal.tsxnew file mode 100644index 00000000000..e5a9b821cea--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelineModal/TimelineModal.tsx@@ -0,0 +1,83 @@+import type { ReactNode } from "react";++import {+ LoadingAndErrorWrapper,+ type LoadingAndErrorWrapperProps,+} from "metabase/common/components/LoadingAndErrorWrapper";+import {+ Flex,+ type FlexProps,+ Modal,+ type ModalDensity,+ NO_ANIMATION_MODAL_PROPS,+} from "metabase/ui";++import {+ TimelineModalHeader,+ type TimelineModalHeaderProps,+} from "../TimelineModalHeader";++import S from "./TimelineModal.module.css";++export interface TimelineModalProps extends Partial<TimelineModalHeaderProps> {+ onClose: () => void;+ /** Defaults to `true`. */+ animated?: boolean;+ density?: ModalDensity;+ /** At least 36rem tall, with the body laid out for a scrolling list. */+ tall?: boolean;+ children: ReactNode;+}++/**+ * The modal every timeline modal renders in. Render it once and switch only+ * its children, so the modal stays in place while content loads.+ */+export const TimelineModal = ({+ title,+ collectionName,+ menu,+ onGoBack,+ onClose,+ animated = true,+ density,+ tall = false,+ children,+}: TimelineModalProps) => (+ <Modal.Root+ opened+ size="lg"+ density={density}+ classNames={tall ? { content: S.content, body: S.body } : undefined}+ onClose={onClose}+ {...(animated ? undefined : NO_ANIMATION_MODAL_PROPS)}+ >+ <Modal.Overlay />+ <Modal.Content>+ <TimelineModalHeader+ title={title}+ collectionName={collectionName}+ menu={menu}+ onGoBack={onGoBack}+ />+ <Modal.Body>{children}</Modal.Body>+ </Modal.Content>+ </Modal.Root>+);++/** A spinner, or the error, filling a `tall` `TimelineModal`. */+export const TimelineModalLoadingState = ({+ loading,+ error,+}: Pick<LoadingAndErrorWrapperProps, "loading" | "error">) => (+ <LoadingAndErrorWrapper+ className={S.loading}+ loading={loading}+ error={error}+ />+);++/** A list that scrolls between the header and footer of a `tall` `TimelineModal`. */+export const TimelineModalScrollArea = (props: FlexProps) => (+ <Flex className={S.scrollArea} {...props} />+);diff --git a/frontend/src/metabase/timelines/common/components/TimelineModal/index.ts b/frontend/src/metabase/timelines/common/components/TimelineModal/index.tsnew file mode 100644index 00000000000..f2cb9ec883d--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelineModal/index.ts@@ -0,0 +1,6 @@+export {+ TimelineModal,+ TimelineModalLoadingState,+ TimelineModalScrollArea,+} from "./TimelineModal";+export type { TimelineModalProps } from "./TimelineModal";diff --git a/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.module.css b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.module.cssnew file mode 100644index 00000000000..65f50f423f4--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.module.css@@ -0,0 +1,27 @@+.backButton {+ display: flex;+ flex: 0 0 auto;+ align-items: center;+ height: rem(24px);+ margin-inline-end: calc(+ var(--mantine-spacing-sm) - var(--mantine-spacing-md)+ );+ color: var(--mb-color-text-primary);++ &:hover {+ color: var(--mb-color-text-brand);+ }+}++.clickableTitle {+ cursor: pointer;++ &:hover {+ color: var(--mb-color-text-brand);+ }+}++.header:has(.clickableTitle:hover) .backButton,+.header:has(.backButton:hover) .clickableTitle {+ color: var(--mb-color-text-brand);+}diff --git a/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.tsx b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.tsxnew file mode 100644index 00000000000..081a2fced6d--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.tsx@@ -0,0 +1,94 @@+import type { ReactNode } from "react";+import { c, t } from "ttag";++import { ForwardRefLink } from "metabase/common/components/Link";+import {+ ActionIcon,+ Group,+ Icon,+ Menu,+ Modal,+ Stack,+ UnstyledButton,+} from "metabase/ui";++import S from "./TimelineModalHeader.module.css";++export interface TimelineModalMenuItem {+ label: string;+ to: string;+}++export interface TimelineModalMenu {+ /** The accessible name of the "⋯" button. */+ label: string;+ items: TimelineModalMenuItem[];+}++export interface TimelineModalHeaderProps {+ title?: ReactNode;+ collectionName?: string;+ /** A "⋯" menu of links, left out when it has no items. */+ menu?: TimelineModalMenu;+ onGoBack?: () => void;+}++/**+ * The header of the timeline list and details modals, for use inside+ * `Modal.Content`: the standard title and close button, plus an optional back+ * button, collection path and "⋯" menu.+ */+export const TimelineModalHeader = ({+ title,+ collectionName,+ menu,+ onGoBack,+}: TimelineModalHeaderProps) => (+ <Modal.Header className={S.header}>+ {onGoBack && (+ <UnstyledButton+ className={S.backButton}+ aria-label={t`Back`}+ onClick={onGoBack}+ >+ <Icon name="chevronleft" />+ </UnstyledButton>+ )}+ <Stack gap="xs" flex="1 1 auto" miw={0}>+ <Modal.Title+ className={onGoBack ? S.clickableTitle : undefined}+ onClick={onGoBack}+ >+ {title}+ </Modal.Title>+ {collectionName && (+ <Group gap="xxs">+ {c("Refers to: 'Events' in a collection").t`in`}+ <Icon name="folder" c="text-disabled" />+ {collectionName}+ </Group>+ )}+ </Stack>+ <Group gap="sm" wrap="nowrap">+ {menu && menu.items.length > 0 && <TimelineModalMenuButton {...menu} />}+ <Modal.CloseButton />+ </Group>+ </Modal.Header>+);++const TimelineModalMenuButton = ({ label, items }: TimelineModalMenu) => (+ <Menu position="bottom-end" shadow="sm">+ <Menu.Target>+ <ActionIcon size="sm" variant="subtle" aria-label={label}>+ <Icon name="ellipsis" />+ </ActionIcon>+ </Menu.Target>+ <Menu.Dropdown>+ {items.map((item) => (+ <Menu.Item key={item.to} component={ForwardRefLink} to={item.to}>+ {item.label}+ </Menu.Item>+ ))}+ </Menu.Dropdown>+ </Menu>+);diff --git a/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.unit.spec.tsxnew file mode 100644index 00000000000..8ce4c5a0beb--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/TimelineModalHeader.unit.spec.tsx@@ -0,0 +1,81 @@+import userEvent from "@testing-library/user-event";++import { renderWithProviders, screen } from "__support__/ui";+import { Modal } from "metabase/ui";++import {+ TimelineModalHeader,+ type TimelineModalHeaderProps,+} from "./TimelineModalHeader";++interface SetupOpts extends Partial<TimelineModalHeaderProps> {+ onClose?: () => void;+}++const setup = ({ onClose = jest.fn(), ...props }: SetupOpts = {}) => {+ renderWithProviders(+ <Modal.Root opened onClose={onClose}>+ <Modal.Content>+ <TimelineModalHeader title="Events" {...props} />+ </Modal.Content>+ </Modal.Root>,+ );++ return { onClose };+};++describe("TimelineModalHeader", () => {+ it("should render the title as the modal heading", () => {+ setup();++ expect(screen.getByRole("heading", { name: "Events" })).toBeInTheDocument();+ expect(screen.queryByText(/^in/)).not.toBeInTheDocument();+ expect(+ screen.queryByRole("button", { name: "Back" }),+ ).not.toBeInTheDocument();+ });++ it("should render the collection path and the menu's links", async () => {+ setup({+ collectionName: "Foo",+ menu: {+ label: "Timeline menu",+ items: [{ label: "New timeline", to: "/collection/1/timelines/new" }],+ },+ });++ expect(screen.getByText(/^in.*Foo$/)).toBeInTheDocument();+ await userEvent.click(+ screen.getByRole("button", { name: "Timeline menu" }),+ );+ expect(+ screen.getByRole("menuitem", { name: "New timeline" }),+ ).toHaveAttribute("href", "/collection/1/timelines/new");+ });++ it("should leave out a menu with no items", () => {+ setup({ menu: { label: "Timeline menu", items: [] } });++ expect(+ screen.queryByRole("button", { name: "Timeline menu" }),+ ).not.toBeInTheDocument();+ });++ it("should go back", async () => {+ const onGoBack = jest.fn();+ setup({ onGoBack });++ await userEvent.click(screen.getByRole("button", { name: "Back" }));+ expect(onGoBack).toHaveBeenCalledTimes(1);++ await userEvent.click(screen.getByRole("heading", { name: "Events" }));+ expect(onGoBack).toHaveBeenCalledTimes(2);+ });++ it("should close the modal", async () => {+ const { onClose } = setup();++ await userEvent.click(screen.getByRole("button", { name: "Close" }));+ expect(onClose).toHaveBeenCalledTimes(1);+ });+});diff --git a/frontend/src/metabase/timelines/common/components/TimelineModalHeader/index.ts b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/index.tsnew file mode 100644index 00000000000..7e16f7bd617--- /dev/null+++ b/frontend/src/metabase/timelines/common/components/TimelineModalHeader/index.ts@@ -0,0 +1,5 @@+export { TimelineModalHeader } from "./TimelineModalHeader";+export type {+ TimelineModalHeaderProps,+ TimelineModalMenuItem,+} from "./TimelineModalHeader";diff --git a/frontend/src/metabase/timelines/common/constants.ts b/frontend/src/metabase/timelines/common/constants.tsdeleted file mode 100644index dc2f151ebd0..00000000000--- a/frontend/src/metabase/timelines/common/constants.ts+++ /dev/null@@ -1,6 +0,0 @@-/**- * 36rem, or Mantine's dialog cap on short viewports.- * The outer calc stops Mantine's style props from converting the 2 to rem.- */-export const MODAL_MIN_HEIGHT =- "calc(min(36rem, 100dvh - 2 * var(--modal-y-offset)))";diff --git a/frontend/src/metabase/timelines/panel/components/TimelineEventModals/TimelineEventModals.tsx b/frontend/src/metabase/timelines/panel/components/TimelineEventModals/TimelineEventModals.tsxindex 7e3f8365720..b9f0a5689da 100644--- a/frontend/src/metabase/timelines/panel/components/TimelineEventModals/TimelineEventModals.tsx+++ b/frontend/src/metabase/timelines/panel/components/TimelineEventModals/TimelineEventModals.tsx@@ -1,9 +1,5 @@import { match } from "ts-pattern";-import { t } from "ttag";-import { skipToken, useGetTimelineEventQuery } from "metabase/api";-import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { Modal } from "metabase/ui";import type {CollectionId,TimelineEvent,@@ -20,13 +16,6 @@ export type TimelineEventModalState =| { type: "edit"; eventId: TimelineEventId }| { type: "move"; eventId: TimelineEventId };-const getModalLabel = (type: TimelineEventModalState["type"]) =>- ({- new: t`New event`,- edit: t`Edit event`,- move: t`Move event`,- })[type];-export function TimelineEventModals({modal,collectionId,@@ -40,17 +29,11 @@ export function TimelineEventModals({onEventCreated?: (event: TimelineEvent) => void;onClose: () => void;}) {- // The edit/move containers render nothing until the event arrives, so the- // modal shows this query's loading and error states instead of a blank box.- const { isLoading, error } = useGetTimelineEventQuery(- modal && modal.type !== "new" ? modal.eventId : skipToken,- );-if (!modal) {return null;}- const content = match(modal)+ return match(modal).with({ type: "new" }, () => (<NewEventModalcollectionId={collectionId}@@ -70,19 +53,4 @@ export function TimelineEventModals({/>)).exhaustive();-- return (- <Modal- opened- onClose={onClose}- size="lg"- withCloseButton={false}- padding={0}- aria-label={getModalLabel(modal.type)}- >- <LoadingAndErrorWrapper loading={isLoading} error={error}>- {content}- </LoadingAndErrorWrapper>- </Modal>- );}diff --git a/frontend/src/metabase/timelines/panel/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/panel/containers/EditEventModal/EditEventModal.tsxindex 3ec976beb6a..a97cb89458c 100644--- a/frontend/src/metabase/timelines/panel/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/panel/containers/EditEventModal/EditEventModal.tsx@@ -7,12 +7,16 @@ import {import { useSetArchive } from "metabase/archive/hooks";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import EditEventModal from "metabase/timelines/common/components/EditEventModal";+import EditEventForm from "metabase/timelines/common/components/EditEventForm";+import {+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import type { TimelineEvent } from "metabase-types/api";interface EditEventModalContainerProps {eventId: number;- onClose?: () => void;+ onClose: () => void;}function EditEventModalContainer({@@ -21,13 +25,9 @@ function EditEventModalContainer({}: EditEventModalContainerProps) {const dispatch = useDispatch();const archive = useSetArchive();- const { data: event } = useGetTimelineEventQuery(eventId);+ const { data: event, isLoading, error } = useGetTimelineEventQuery(eventId);const [updateTimelineEvent] = useUpdateTimelineEventMutation();- if (!event) {- return null;- }-const onSubmit = async (event: TimelineEvent) => {await updateTimelineEvent(event).unwrap();dispatch(addUndo({ message: t`Updated event` }));@@ -37,14 +37,25 @@ function EditEventModalContainer({archive({ id: event.id, model: "timeline-event" }, true);return (- <EditEventModal- event={event}- onSubmit={onSubmit}- onSubmitSuccess={onClose}- onArchive={onArchive}- onArchiveSuccess={onClose}+ <TimelineModal+ title={t`Edit event`}+ density="relaxed"+ tall={isLoading || !!error || !event}onClose={onClose}- />+ >+ {isLoading || error || !event ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <EditEventForm+ event={event}+ onSubmit={onSubmit}+ onSubmitSuccess={onClose}+ onArchive={onArchive}+ onArchiveSuccess={onClose}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsxindex e6ec6547cd1..f2e0ab8941f 100644--- a/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/panel/containers/MoveEventModal/MoveEventModal.tsx@@ -1,32 +1,32 @@+import { t } from "ttag";+import {useGetCollectionQuery,useGetTimelineEventQuery,useListTimelinesQuery,} from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import { MoveEventForm } from "metabase/timelines/common/components/MoveEventForm";import {- MoveEventModal,- type MoveEventModalProps,-} from "metabase/timelines/common/components/MoveEventModal";+ TimelineModal,+ TimelineModalLoadingState,+} from "metabase/timelines/common/components/TimelineModal";import { useSetTimeline } from "metabase/timelines/common/hooks";import type { CollectionId, Timeline, TimelineEvent } from "metabase-types/api";-type ContainerProps = Omit<- MoveEventModalProps,- "event" | "timelines" | "collection" | "onSubmit" | "onSubmitSuccess"-> & {+interface MoveEventModalContainerProps {eventId: number;collectionId?: CollectionId | null;- onClose?: () => void;-};+ onClose: () => void;+}function MoveEventModalContainer({eventId,collectionId,- ...props-}: ContainerProps) {+ onClose,+}: MoveEventModalContainerProps) {const setTimeline = useSetTimeline();- const { data: event } = useGetTimelineEventQuery(eventId);+ const { data: event, isLoading, error } = useGetTimelineEventQuery(eventId);const { data: timelines = [] } = useListTimelinesQuery({ include: "events" });const { data: collection } = useGetCollectionQuery({id: collectionId == null ? ROOT_COLLECTION.id : collectionId,@@ -37,19 +37,25 @@ function MoveEventModalContainer({}};- if (!event) {- return null;- }-return (- <MoveEventModal- {...props}- event={event}- timelines={timelines}- collection={collection}- onSubmit={handleSubmit}- onSubmitSuccess={props.onClose}- />+ <TimelineModal+ title={event ? t`Move ${event.name}` : undefined}+ tall+ onClose={onClose}+ >+ {isLoading || error || !event ? (+ <TimelineModalLoadingState loading={isLoading} error={error} />+ ) : (+ <MoveEventForm+ event={event}+ timelines={timelines}+ collection={collection}+ onSubmit={handleSubmit}+ onSubmitSuccess={onClose}+ onCancel={onClose}+ />+ )}+ </TimelineModal>);}diff --git a/frontend/src/metabase/timelines/panel/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/panel/containers/NewEventModal/NewEventModal.tsxindex 9255ce01f80..954ba9ce581 100644--- a/frontend/src/metabase/timelines/panel/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/panel/containers/NewEventModal/NewEventModal.tsx@@ -10,7 +10,8 @@ import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { getDefaultTimeline } from "metabase/common/utils/timelines";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";-import NewEventModal from "metabase/timelines/common/components/NewEventModal";+import NewEventForm from "metabase/timelines/common/components/NewEventForm";+import { TimelineModal } from "metabase/timelines/common/components/TimelineModal";import type {Collection,CollectionId,@@ -23,7 +24,7 @@ interface NewEventModalContainerProps {collectionId?: CollectionId | null;source?: TimelineEventSource;onEventCreated?: (event: TimelineEvent) => void;- onClose?: () => void;+ onClose: () => void;}function NewEventModalContainer({@@ -64,14 +65,16 @@ function NewEventModalContainer({};return (- <NewEventModal- source={source}- timelines={timelines}- collection={collection}- onSubmit={onSubmit}- onSubmitSuccess={onClose}- onClose={onClose}- />+ <TimelineModal title={t`New event`} density="relaxed" onClose={onClose}>+ <NewEventForm+ source={source}+ timelines={timelines}+ collection={collection}+ onSubmit={onSubmit}+ onSubmitSuccess={onClose}+ onCancel={onClose}+ />+ </TimelineModal>);}diff --git a/frontend/test/__support__/server-mocks/timeline.ts b/frontend/test/__support__/server-mocks/timeline.tsindex ab69132f914..fcb631bba22 100644--- a/frontend/test/__support__/server-mocks/timeline.ts+++ b/frontend/test/__support__/server-mocks/timeline.ts@@ -1,9 +1,16 @@import fetchMock from "fetch-mock";-import type { Timeline } from "metabase-types/api";+import type { CollectionId, Timeline } from "metabase-types/api";type TimelineResponse = Timeline[] | (() => Promise<Timeline[]>);export function setupTimelinesEndpoints(response: TimelineResponse) {fetchMock.get("path:/api/timeline", response);}++export function setupCollectionTimelinesEndpoint(+ collectionId: CollectionId,+ response: TimelineResponse,+) {+ fetchMock.get(`path:/api/timeline/collection/${collectionId}`, response);+}