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
Fix some modals not closing properly without browser history (#65370)
Anderson4578d66e2e4f
diff --git a/e2e/test/scenarios/admin/troubleshooting.cy.spec.js b/e2e/test/scenarios/admin/troubleshooting.cy.spec.jsindex 8e29f0af8b7..1297cf68a77 100644--- a/e2e/test/scenarios/admin/troubleshooting.cy.spec.js+++ b/e2e/test/scenarios/admin/troubleshooting.cy.spec.js@@ -523,4 +523,29 @@ describe("admin > tools", () => {}).should("be.visible");cy.findByRole("button", { name: "Try for free" });});++ describe("issue 57113", () => {+ it("should navigate to /admin/tools/tasks when closing Task details modal even with no browser history", () => {+ cy.visit("/admin/tools/tasks");++ cy.log("Pick an existing task url");++ cy.findAllByTestId("task").should("be.visible").first().click();++ cy.location("pathname")+ .should("match", /\/admin\/tools\/tasks\/[0-9]+$/)+ .then((pathname) => {+ // Clear all history and navigate to the task detail modal page+ cy.window().then((window) => {+ window.history.replaceState(null, "", pathname);+ // Clear the entire history stack by going to about:blank first+ window.location.href = "about:blank";+ });++ cy.visit(pathname);+ H.modal().findByRole("img", { name: "close icon" }).click();+ cy.location("pathname").should("eq", "/admin/tools/tasks");+ });+ });+ });});diff --git a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsxindex 754854da031..820c06fbdba 100644--- a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx+++ b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx@@ -1,4 +1,3 @@-import { goBack } from "react-router-redux";import { useUnmount } from "react-use";import { c, t } from "ttag";@@ -111,7 +110,6 @@ export const UserPasswordResetModal = (props: UserPasswordResetModalProps) => {{user && (<UserPasswordResetModalInner{...props}- onClose={() => dispatch(goBack())}clearTemporaryPassword={() =>dispatch(clearTemporaryPassword(user.id))}diff --git a/frontend/src/metabase/admin/tools/components/JobTriggersModal.jsx b/frontend/src/metabase/admin/tools/components/JobTriggersModal.jsxindex f33d6a1c2dd..30a69ad341b 100644--- a/frontend/src/metabase/admin/tools/components/JobTriggersModal.jsx+++ b/frontend/src/metabase/admin/tools/components/JobTriggersModal.jsx@@ -1,6 +1,5 @@/* eslint-disable react/prop-types */import cx from "classnames";-import { goBack } from "react-router-redux";import { t } from "ttag";import _ from "underscore";@@ -9,7 +8,6 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport ModalContent from "metabase/common/components/ModalContent";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";-import { useDispatch } from "metabase/lib/redux";const renderTriggersTable = (triggers) => {return (@@ -52,7 +50,6 @@ const renderTriggersTable = (triggers) => {};export const JobTriggersModal = (props) => {- const dispatch = useDispatch();const { data, error, isFetching } = useGetTasksInfoQuery();const { jobKey } = props.params;@@ -60,10 +57,7 @@ export const JobTriggersModal = (props) => {const job = jobs && _.findWhere(jobs, { key: jobKey });return (- <ModalContent- title={t`Triggers for ${jobKey}`}- onClose={() => dispatch(goBack())}- >+ <ModalContent title={t`Triggers for ${jobKey}`} onClose={props.onClose}><LoadingAndErrorWrapper loading={isFetching} error={error}>{() => renderTriggersTable(job?.triggers)}</LoadingAndErrorWrapper>diff --git a/frontend/src/metabase/admin/tools/components/TaskModal/TaskModal.tsx b/frontend/src/metabase/admin/tools/components/TaskModal/TaskModal.tsxindex 5912b35f834..ff517c7465d 100644--- a/frontend/src/metabase/admin/tools/components/TaskModal/TaskModal.tsx+++ b/frontend/src/metabase/admin/tools/components/TaskModal/TaskModal.tsx@@ -1,6 +1,5 @@import { useMemo } from "react";import { Link } from "react-router";-import { goBack } from "react-router-redux";import { t } from "ttag";import { useGetTaskQuery } from "metabase/api";@@ -9,7 +8,6 @@ import { CopyButton } from "metabase/common/components/CopyButton";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import ModalContent from "metabase/common/components/ModalContent";import { openSaveDialog } from "metabase/lib/dom";-import { useDispatch } from "metabase/lib/redux";import { Box, Button, Flex, Icon } from "metabase/ui";import type { Task } from "metabase-types/api";@@ -17,18 +15,14 @@ import S from "./TaskModal.module.css";interface Props {params: { taskId: number };+ onClose: VoidFunction;}-export const TaskModal = ({ params }: Props) => {- const dispatch = useDispatch();+export const TaskModal = ({ params, onClose }: Props) => {const { data: task, error, isLoading } = useGetTaskQuery(params.taskId);const code = formatTaskDetails(task);const linesCount = useMemo(() => code.split("\n").length, [code]);- const handleClose = () => {- dispatch(goBack());- };-const handleDownload = () => {const filename = getFilename(task);const blob = new Blob([code], { type: "text/json" });@@ -40,7 +34,7 @@ export const TaskModal = ({ params }: Props) => {}return (- <ModalContent title={t`Task details`} onClose={handleClose}>+ <ModalContent title={t`Task details`} onClose={onClose}><BoxclassName={S.codeContainer}p={linesCount > 1 ? 0 : "xs"}diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsxindex 34511976ea5..e886daf6e0c 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import TimelineEvents from "metabase/entities/timeline-events";@@ -32,9 +32,6 @@ const mapDispatchToProps = (dispatch: any) => ({await dispatch(TimelineEvents.actions.delete(event));dispatch(push(Urls.timelineArchiveInCollection(timeline)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsxindex 9215b6c4767..60b1b536eb2 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import Timelines from "metabase/entities/timelines";@@ -25,9 +25,6 @@ const mapDispatchToProps = (dispatch: any) => ({await dispatch(Timelines.actions.delete(timeline));dispatch(push(Urls.timelinesArchiveInCollection(timeline.collection)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsxindex 38497728909..0cbaae052da 100644--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import TimelineEvents from "metabase/entities/timeline-events";@@ -39,9 +39,6 @@ const mapDispatchToProps = (dispatch: any) => ({await dispatch(TimelineEvents.actions.setArchived(event, true));timeline && dispatch(push(Urls.timelineInCollection(timeline)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsxindex 117d6009312..a60e6a88bb5 100644--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import Timelines from "metabase/entities/timelines";@@ -31,9 +31,6 @@ const mapDispatchToProps = (dispatch: any) => ({await dispatch(Timelines.actions.setArchived(timeline, true));dispatch(push(Urls.timelinesInCollection(timeline.collection)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsxindex 2bdc8d748ec..60686e228a2 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import Collections from "metabase/entities/collections";@@ -44,9 +44,6 @@ const mapDispatchToProps = (dispatch: any) => ({await dispatch(TimelineEvents.actions.setTimeline(event, newTimeline));dispatch(push(Urls.timelineInCollection(oldTimeline)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsxindex d3f7ff5329f..509cf01920c 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx@@ -1,4 +1,3 @@-import { goBack } from "react-router-redux";import _ from "underscore";import Timelines from "metabase/entities/timelines";@@ -27,9 +26,6 @@ const mapDispatchToProps = (dispatch: any) => ({onSubmit: async (timeline: Timeline, collectionId: number | null) => {dispatch(setCollectionAndNavigate(timeline, collectionId));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsxindex a43d8cdea11..46cf1c7c8d9 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import TimelineEvents from "metabase/entities/timeline-events";@@ -38,9 +38,6 @@ const mapDispatchToProps = (dispatch: any) => ({await dispatch(TimelineEvents.actions.create(values));dispatch(push(Urls.timelineInCollection(timeline)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsxindex 62d25880337..f65edb5c870 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import Collections from "metabase/entities/collections";@@ -29,9 +29,6 @@ const mapDispatchToProps = (dispatch: any) => ({await dispatch(Timelines.actions.fetchList(query));dispatch(push(Urls.timelinesInCollection(collection)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsxindex ab81754706f..a0a79ca7aab 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx@@ -1,4 +1,4 @@-import { goBack, push } from "react-router-redux";+import { push } from "react-router-redux";import _ from "underscore";import Collections from "metabase/entities/collections";@@ -29,9 +29,6 @@ const mapDispatchToProps = (dispatch: any) => ({const timeline = Timelines.HACK_getObjectFromAction(response);dispatch(push(Urls.timelineInCollection(timeline)));},- onCancel: () => {- dispatch(goBack());- },});// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsxindex 4d01ecdcd18..694a3e0ed79 100644--- a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.tsx@@ -12,7 +12,6 @@ export interface DeleteEventModalProps {timeline: Timeline;onSubmit: (event: TimelineEvent, timeline: Timeline) => void;onSubmitSuccess?: () => void;- onCancel?: () => void;onClose?: () => void;}@@ -21,7 +20,6 @@ const DeleteEventModal = ({timeline,onSubmit,onSubmitSuccess,- onCancel,onClose,}: DeleteEventModalProps): JSX.Element => {const handleSubmit = useCallback(async () => {@@ -33,7 +31,7 @@ const DeleteEventModal = ({<div><ModalHeader title={t`Delete ${event?.name}?`} onClose={onClose} /><ModalFooter hasPadding>- <Button onClick={onCancel}>{t`Cancel`}</Button>+ <Button onClick={onClose}>{t`Cancel`}</Button><Button danger onClick={handleSubmit}>{t`Delete`}</Button></ModalFooter></div>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.tsxindex 13d686d4de5..34e2c629bed 100644--- a/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/DeleteEventModal/DeleteEventModal.unit.spec.tsx@@ -26,7 +26,6 @@ const getProps = (event: createMockTimelineEvent(),timeline: createMockTimeline(),onSubmit: jest.fn(),- onCancel: 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.tsxindex 728dd68f317..c023403fe2b 100644--- a/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -11,7 +11,6 @@ export interface DeleteTimelineModalProps {timeline: Timeline;onSubmit: (timeline: Timeline) => void;onSubmitSuccess?: () => void;- onCancel?: () => void;onClose?: () => void;}@@ -19,7 +18,6 @@ const DeleteTimelineModal = ({timeline,onSubmit,onSubmitSuccess,- onCancel,onClose,}: DeleteTimelineModalProps): JSX.Element => {const handleSubmit = useCallback(async () => {@@ -31,7 +29,7 @@ const DeleteTimelineModal = ({<div><ModalHeader title={t`Delete ${timeline?.name}?`} onClose={onClose} /><ModalFooter hasPadding>- <Button onClick={onCancel}>{t`Cancel`}</Button>+ <Button onClick={onClose}>{t`Cancel`}</Button><Button danger onClick={handleSubmit}>{t`Delete`}</Button></ModalFooter></div>diff --git a/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsxindex 0166a2c2eb0..e1662dd54c1 100644--- a/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/EditEventModal/EditEventModal.tsx@@ -18,7 +18,6 @@ export interface EditEventModalProps {onSubmitSuccess?: () => void;onArchive: (event: TimelineEvent, timeline?: Timeline) => void;onArchiveSuccess?: () => void;- onCancel?: () => void;onClose?: () => void;}@@ -29,7 +28,6 @@ const EditEventModal = ({onSubmitSuccess,onArchive,onArchiveSuccess,- onCancel,onClose,}: EditEventModalProps): JSX.Element => {const handleSubmit = useCallback(@@ -53,7 +51,7 @@ const EditEventModal = ({initialValues={event}onSubmit={handleSubmit}onArchive={handleArchive}- onCancel={onCancel}+ onCancel={onClose}/></ModalBody></div>diff --git a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsxindex b23f95062bd..f8b9c5af166 100644--- a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.tsx@@ -13,7 +13,6 @@ export interface EditTimelineModalProps {onSubmitSuccess?: () => void;onArchive: (timeline: Timeline) => void;onArchiveSuccess?: () => void;- onCancel?: () => void;onClose?: () => void;}@@ -23,7 +22,6 @@ const EditTimelineModal = ({onSubmitSuccess,onArchive,onArchiveSuccess,- onCancel,onClose,}: EditTimelineModalProps): JSX.Element => {const handleSubmit = useCallback(@@ -47,7 +45,7 @@ const EditTimelineModal = ({initialValues={timeline}onSubmit={handleSubmit}onArchive={handleArchive}- onCancel={onCancel}+ onCancel={onClose}/></ModalBody></div>diff --git a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.unit.spec.tsxindex a961b3f8fa5..e696fae9cd3 100644--- a/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/EditTimelineModal/EditTimelineModal.unit.spec.tsx@@ -28,7 +28,6 @@ const getProps = (timeline: createMockTimeline(),onSubmit: jest.fn(),onArchive: jest.fn(),- onCancel: jest.fn(),onClose: jest.fn(),...opts,});diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsxindex 316572d8e8c..ea0662d584d 100644--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.tsx@@ -21,7 +21,6 @@ export interface MoveEventModalProps {oldTimeline?: Timeline,) => void;onSubmitSuccess?: () => void;- onCancel?: () => void;onClose?: () => void;}@@ -31,7 +30,6 @@ const MoveEventModal = ({collection,onSubmit,onSubmitSuccess,- onCancel,onClose,}: MoveEventModalProps): JSX.Element => {const oldTimeline = timelines.find((t) => t.id === event.timeline_id);@@ -58,7 +56,7 @@ const MoveEventModal = ({/></ModalBody><ModalFooter>- <Button onClick={onCancel}>{t`Cancel`}</Button>+ <Button onClick={onClose}>{t`Cancel`}</Button><Button primary disabled={!isEnabled} onClick={handleSubmit}>{t`Move`}</Button>diff --git a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsxindex c0f14f296be..2fc273e58c3 100644--- a/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/MoveEventModal/MoveEventModal.unit.spec.tsx@@ -39,7 +39,6 @@ const getProps = (event: createMockTimelineEvent(),timelines: [],onSubmit: jest.fn(),- onCancel: jest.fn(),onClose: jest.fn(),...opts,});diff --git a/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsxindex 54f9bde40de..198311d0546 100644--- a/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/MoveTimelineModal/MoveTimelineModal.tsx@@ -12,7 +12,6 @@ export interface MoveTimelineModalProps {timeline: Timeline;onSubmit: (timeline: Timeline, collectionId: CollectionId) => void;onSubmitSuccess?: () => void;- onCancel?: () => void;onClose: () => void;}diff --git a/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsxindex 65b6644f5c9..cc101d0905c 100644--- a/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/common/components/NewEventModal/NewEventModal.tsx@@ -24,7 +24,6 @@ export interface NewEventModalProps {timeline?: Timeline,) => void;onSubmitSuccess?: () => void;- onCancel?: () => void;onClose?: () => void;}@@ -35,7 +34,6 @@ const NewEventModal = ({cardId,onSubmit,onSubmitSuccess,- onCancel,onClose,}: NewEventModalProps): JSX.Element => {const availableTimelines = useMemo(() => {@@ -61,7 +59,7 @@ const NewEventModal = ({initialValues={initialValues}timelines={availableTimelines}onSubmit={handleSubmit}- onCancel={onCancel}+ onCancel={onClose}/></ModalContent>);diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsxindex bce84a2296a..b63b08849dd 100644--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx@@ -12,7 +12,6 @@ export interface NewTimelineModalProps {collection: Collection;onSubmit: (values: TimelineData, collection: Collection) => void;onSubmitSuccess?: () => void;- onCancel: () => void;onClose?: () => void;}@@ -20,7 +19,6 @@ const NewTimelineModal = ({collection,onSubmit,onSubmitSuccess,- onCancel,onClose,}: NewTimelineModalProps): JSX.Element => {const initialValues = useMemo(() => {@@ -40,7 +38,7 @@ const NewTimelineModal = ({<TimelineForminitialValues={initialValues}onSubmit={handleSubmit}- onCancel={onCancel}+ onCancel={onClose}/></ModalContent>);diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.unit.spec.tsx b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.unit.spec.tsxindex 1b95cc8feab..712625173b6 100644--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.unit.spec.tsx+++ b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.unit.spec.tsx@@ -32,7 +32,6 @@ const getProps = (): NewTimelineModalProps => ({collection: createMockCollection(),onSubmit: jest.fn(),- onCancel: jest.fn(),onClose: jest.fn(),...opts,});