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
Remove timeline entity (#73674)
Romeo Van Snick3b9a369185bf
diff --git a/frontend/src/metabase/api/timeline.ts b/frontend/src/metabase/api/timeline.tsindex 0863a41fc80..851acc3b390 100644--- a/frontend/src/metabase/api/timeline.ts+++ b/frontend/src/metabase/api/timeline.ts@@ -1,4 +1,3 @@-import { TimelineSchema } from "metabase/schema";import type {CreateTimelineRequest,GetTimelineRequest,@@ -18,7 +17,6 @@ import {provideTimelineTags,tag,} from "./tags";-import { hydrateLegacyEntities } from "./utils/hydrate-legacy-entities";export const timelineApi = Api.injectEndpoints({endpoints: (builder) => ({@@ -29,7 +27,6 @@ export const timelineApi = Api.injectEndpoints({params,}),providesTags: (timelines = []) => provideTimelineListTags(timelines),- onQueryStarted: hydrateLegacyEntities([TimelineSchema]),}),listCollectionTimelines: builder.query<Timeline[],@@ -41,7 +38,6 @@ export const timelineApi = Api.injectEndpoints({params,}),providesTags: (timelines = []) => provideTimelineListTags(timelines),- onQueryStarted: hydrateLegacyEntities([TimelineSchema]),}),getTimeline: builder.query<Timeline, GetTimelineRequest>({query: ({ id, ...params }) => ({@@ -51,7 +47,6 @@ export const timelineApi = Api.injectEndpoints({}),providesTags: (timeline) =>timeline ? provideTimelineTags(timeline) : [],- onQueryStarted: hydrateLegacyEntities(TimelineSchema),}),createTimeline: builder.mutation<Timeline, CreateTimelineRequest>({query: (body) => ({diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.tsindex e6e982c4fe3..097a0f06fa4 100644--- a/frontend/src/metabase/entities/index.ts+++ b/frontend/src/metabase/entities/index.ts@@ -74,8 +74,6 @@ export { SnippetCollections as snippetCollections } from "./snippet-collections"export { Dashboards as dashboards } from "./dashboards";export { Questions as questions } from "./questions";-export { Timelines as timelines } from "./timelines";-export { Bookmarks as bookmarks } from "./bookmarks";export { Databases as databases } from "./databases";export { Schemas as schemas } from "./schemas";diff --git a/frontend/src/metabase/entities/timelines.js b/frontend/src/metabase/entities/timelines.jsdeleted file mode 100644index de82cdca809..00000000000--- a/frontend/src/metabase/entities/timelines.js+++ /dev/null@@ -1,95 +0,0 @@-import {- skipToken,- timelineApi,- timelineEventApi,- useGetTimelineQuery,- useListCollectionTimelinesQuery,- useListTimelinesQuery,-} from "metabase/api";-import { getDefaultTimeline } from "metabase/common/utils/timelines";-import { TimelineSchema } from "metabase/schema";--import { createEntity, entityCompatibleQuery } from "./utils";--/**- * @deprecated use "metabase/api" instead- */-export const Timelines = createEntity({- name: "timelines",- nameOne: "timeline",- path: "/api/timeline",- schema: TimelineSchema,-- rtk: () => ({- getUseGetQuery: () => ({- useGetQuery: useGetTimelineQuery,- }),- useListQuery,- }),-- api: {- list: ({ collectionId, ...params } = {}, dispatch) =>- collectionId- ? entityCompatibleQuery(- { id: collectionId, ...params },- dispatch,- timelineApi.endpoints.listCollectionTimelines,- )- : entityCompatibleQuery(- params,- dispatch,- timelineApi.endpoints.listTimelines,- ),- get: (entityQuery, options, dispatch) =>- entityCompatibleQuery(- entityQuery,- dispatch,- timelineApi.endpoints.getTimeline,- ),- create: (entityQuery, dispatch) =>- entityCompatibleQuery(- entityQuery,- dispatch,- timelineApi.endpoints.createTimeline,- ),- update: (entityQuery, dispatch) =>- entityCompatibleQuery(- entityQuery,- dispatch,- timelineApi.endpoints.updateTimeline,- ),- delete: ({ id }, dispatch) =>- entityCompatibleQuery(id, dispatch, timelineApi.endpoints.deleteTimeline),- },-- actions: {- createWithEvent: (event, collection) => async (dispatch) => {- const timeline = await entityCompatibleQuery(- getDefaultTimeline(collection),- dispatch,- timelineApi.endpoints.createTimeline,- );- await entityCompatibleQuery(- { ...event, timeline_id: timeline.id },- dispatch,- timelineEventApi.endpoints.createTimelineEvent,- );-- dispatch({ type: Timelines.actionTypes.INVALIDATE_LISTS_ACTION });- },- },-});--function useListQuery({ collectionId, ...params } = {}, options) {- const collectionTimelines = useListCollectionTimelinesQuery(- collectionId ? { id: collectionId, ...params } : skipToken,- options,- );-- const timelines = useListTimelinesQuery(- collectionId ? skipToken : params,- options,- );-- return collectionId ? collectionTimelines : timelines;-}diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex d970033a941..1ca1627ccac 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -8,6 +8,7 @@ import { useMount, usePrevious, useUnmount } from "react-use";import { t } from "ttag";import _ from "underscore";+import { useListTimelinesQuery } from "metabase/api";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { isRouteInSync } from "metabase/common/hooks/is-route-in-sync";import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";@@ -16,7 +17,6 @@ import { useForceUpdate } from "metabase/common/hooks/use-force-update";import { useLoadingTimer } from "metabase/common/hooks/use-loading-timer";import { useWebNotification } from "metabase/common/hooks/use-web-notification";import { Bookmarks } from "metabase/entities/bookmarks";-import { Timelines } from "metabase/entities/timelines";import { usePageTitleWithLoadingTime } from "metabase/hooks/use-page-title";import { VISUALIZATION_SLOW_TIMEOUT } from "metabase/querying/constants";import {@@ -60,7 +60,6 @@ import type {BookmarkId,Bookmark as BookmarkType,Series,- Timeline,} from "metabase-types/api";import {@@ -174,29 +173,18 @@ import { useCreateQuestion } from "./use-create-question";import { useRegisterQueryBuilderMetabotContext } from "./use-register-query-builder-metabot-context";import { useSaveQuestion } from "./use-save-question";-const timelineProps = {- query: { include: "events" },- loadingAndErrorWrapper: false,-};-type BookmarkListLoaderOutput = {bookmarks: BookmarkType[];reloadBookmarks: () => void;};-type TimelineListLoaderOutput = {- timelines: Timeline[];- reloadTimelines: () => void;-};-type EntityListLoaderMergedProps = {allLoading: boolean;allLoaded: boolean;allFetched: boolean;allError: boolean;reload: () => void;-} & BookmarkListLoaderOutput &- TimelineListLoaderOutput;+} & BookmarkListLoaderOutput;const mapStateToProps = (state: State, props: EntityListLoaderMergedProps) => {return {@@ -378,6 +366,7 @@ type QueryBuilderInnerProps = ReduxProps &function QueryBuilderInner(props: QueryBuilderInnerProps) {useFavicon({ favicon: props.pageFavicon ?? null });+ useListTimelinesQuery({ include: "events" });const {question,@@ -656,6 +645,5 @@ function QueryBuilderInner(props: QueryBuilderInnerProps) {export const QueryBuilder = _.compose(Bookmarks.loadList(),- Timelines.loadList(timelineProps),connector,)(QueryBuilderInner);diff --git a/frontend/src/metabase/query_builder/selectors.ts b/frontend/src/metabase/query_builder/selectors.tsindex fbffa5caa16..d143e9db214 100644--- a/frontend/src/metabase/query_builder/selectors.ts+++ b/frontend/src/metabase/query_builder/selectors.ts@@ -5,9 +5,9 @@ import dayjs from "dayjs";import { merge, updateIn } from "icepick";import _ from "underscore";+import { timelineApi } from "metabase/api";import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";import { getSortedTimelines } from "metabase/common/utils/timelines";-import { Timelines } from "metabase/entities/timelines";import {isQuestionDirty,isQuestionRunnable,@@ -112,7 +112,6 @@ export const getParameterValues = (state: State) => state.qb.parameterValues;export const getMetadataDiff = (state: State) => state.qb.metadataDiff;-export const getEntities = (state: State) => state.entities;export const getVisibleTimelineEventIds = (state: State) =>state.qb.visibleTimelineEventIds;export const getSelectedTimelineEventIds = (state: State) =>@@ -829,12 +828,13 @@ export const getTimeseriesXDomain = createSelector(},);+const selectListTimelines = timelineApi.endpoints.listTimelines.select({+ include: "events",+});+export const getFetchedTimelines = createSelector(- [getEntities],- (entities): Timeline[] => {- const entityQuery = { include: "events" };- return Timelines.selectors.getList({ entities }, { entityQuery }) ?? [];- },+ [selectListTimelines],+ (result): Timeline[] => result.data ?? [],);export const getTransformedTimelines = createSelector(diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.jsindex bcca917a382..4a1b2b9441a 100644--- a/frontend/src/metabase/schema.js+++ b/frontend/src/metabase/schema.js@@ -72,7 +72,6 @@ export const MetricSchema = new schema.Entity("metrics");export const PersistedModelSchema = new schema.Entity("persistedModels");export const SnippetSchema = new schema.Entity("snippets");export const SnippetCollectionSchema = new schema.Entity("snippetCollections");-export const TimelineSchema = new schema.Entity("timelines");DatabaseSchema.define({tables: [TableSchema],@@ -116,10 +115,6 @@ MeasureSchema.define({table: TableSchema,});-TimelineSchema.define({- collection: CollectionSchema,-});-CacheConfigSchema.define({});export const ENTITIES_SCHEMA_MAP = {diff --git a/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/TimelineIndexModal.tsx b/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/TimelineIndexModal.tsxindex 1374d5c7791..9efa63c33a2 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/TimelineIndexModal.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineIndexModal/TimelineIndexModal.tsx@@ -18,7 +18,7 @@ const TimelineIndexModal = ({if (timelines.length === 1) {return (<TimelineDetailsModal- params={{ ...params, timelineId: timelines[0].id }}+ params={{ ...params, timelineId: String(timelines[0].id) }}onClose={onClose}/>);diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsxindex fd1fea25dcb..625e3acd193 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx@@ -1,42 +1,33 @@import { push } from "react-router-redux";-import _ from "underscore";import {skipToken,useDeleteTimelineEventMutation,useGetTimelineEventQuery,+ useGetTimelineQuery,} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { Timelines } from "metabase/entities/timelines";+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";-import type { State } from "metabase/redux/store";import DeleteEventModal from "metabase/timelines/common/components/DeleteEventModal";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";-import type { ModalParams } from "../../types";--interface DeleteEventModalContainerProps {- params: ModalParams;- timeline: Timeline;-}--const timelineProps = {- id: (state: State, props: DeleteEventModalContainerProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events" },-};--function DeleteEventModalContainer({- params,- timeline,-}: DeleteEventModalContainerProps) {+function DeleteEventModalContainer({ params }: ModalComponentProps) {const dispatch = useDispatch();+ const timelineId = Urls.extractEntityId(params.timelineId);const eventId = Urls.extractEntityId(params.timelineEventId);+ const {+ data: timeline,+ isLoading: isTimelineLoading,+ error: timelineError,+ } = useGetTimelineQuery(+ timelineId != null ? { id: timelineId, include: "events" } : skipToken,+ );const {data: event,- isLoading,- error,+ isLoading: isEventLoading,+ error: eventError,} = useGetTimelineEventQuery(eventId ?? skipToken);const [deleteTimelineEvent] = useDeleteTimelineEventMutation();@@ -45,7 +36,10 @@ function DeleteEventModalContainer({dispatch(push(Urls.timelineArchiveInCollection(timeline)));};- if (isLoading || error || !event) {+ const isLoading = isTimelineLoading || isEventLoading;+ const error = timelineError ?? eventError;++ if (isLoading || error || !event || !timeline) {return <LoadingAndErrorWrapper loading={isLoading} error={error} />;}@@ -55,6 +49,4 @@ function DeleteEventModalContainer({}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(Timelines.load(timelineProps))(- DeleteEventModalContainer,-);+export default DeleteEventModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsxindex 43c122a4acb..c7c707ee565 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -1,34 +1,49 @@import { push } from "react-router-redux";-import _ from "underscore";-import { Timelines } from "metabase/entities/timelines";-import { connect } from "metabase/redux";-import type { State } from "metabase/redux/store";+import {+ skipToken,+ useDeleteTimelineMutation,+ useGetTimelineQuery,+} from "metabase/api";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";+import { useDispatch } from "metabase/redux";import DeleteTimelineModal from "metabase/timelines/common/components/DeleteTimelineModal";import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";-import type { ModalParams } from "../../types";+function DeleteTimelineModalContainer({+ params,+ ...props+}: ModalComponentProps) {+ const dispatch = useDispatch();+ const [deleteTimeline] = useDeleteTimelineMutation();+ const id = Urls.extractEntityId(params.timelineId);+ const {+ data: timeline,+ isLoading,+ error,+ } = useGetTimelineQuery(id != null ? { id, include: "events" } : skipToken);-interface DeleteTimelineModalProps {- params: ModalParams;-}--const timelineProps = {- id: (state: State, props: DeleteTimelineModalProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events" },-};+ if (isLoading || error || !timeline) {+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />+ );+ }-const mapDispatchToProps = (dispatch: any) => ({- onSubmit: async (timeline: Timeline) => {- await dispatch(Timelines.actions.delete(timeline));+ const handleSubmit = async (timeline: Timeline) => {+ await deleteTimeline(timeline.id).unwrap();dispatch(push(Urls.timelinesArchiveInCollection(timeline.collection)));- },-});+ };++ return (+ <DeleteTimelineModal+ {...props}+ timeline={timeline}+ onSubmit={handleSubmit}+ />+ );+}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.load(timelineProps),- connect(null, mapDispatchToProps),-)(DeleteTimelineModal);+export default DeleteTimelineModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsxindex a65f6e708a5..900717c3c0a 100644--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx@@ -1,45 +1,36 @@import { push } from "react-router-redux";-import _ from "underscore";import {skipToken,useGetTimelineEventQuery,+ useGetTimelineQuery,useUpdateTimelineEventMutation,} from "metabase/api";import { useSetArchive } from "metabase/common/hooks";-import { Timelines } from "metabase/entities/timelines";+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";-import type { State } from "metabase/redux/store";import EditEventModal from "metabase/timelines/common/components/EditEventModal";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 EditEventModalContainerProps {- params: ModalParams;- timeline?: Timeline;-}--const timelineProps = {- id: (state: State, props: EditEventModalContainerProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events" },- LoadingAndErrorWrapper,-};--function EditEventModalContainer({- params,- timeline,-}: EditEventModalContainerProps) {+function EditEventModalContainer({ params }: ModalComponentProps) {const dispatch = useDispatch();const archive = useSetArchive();+ const timelineId = Urls.extractEntityId(params.timelineId);const eventId = Urls.extractEntityId(params.timelineEventId);+ const {+ data: timeline,+ isLoading: isTimelineLoading,+ error: timelineError,+ } = useGetTimelineQuery(+ timelineId != null ? { id: timelineId, include: "events" } : skipToken,+ );const {data: event,- isLoading,- error,+ isLoading: isEventLoading,+ error: eventError,} = useGetTimelineEventQuery(eventId ?? skipToken);const [updateTimelineEvent] = useUpdateTimelineEventMutation();@@ -57,6 +48,9 @@ function EditEventModalContainer({}};+ const isLoading = isTimelineLoading || isEventLoading;+ const error = timelineError ?? eventError;+if (isLoading || error || !event) {return <LoadingAndErrorWrapper loading={isLoading} error={error} />;}@@ -72,6 +66,4 @@ function EditEventModalContainer({}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(Timelines.load(timelineProps))(- EditEventModalContainer,-);+export default EditEventModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsxindex 3cf98a62af6..092d56254dd 100644--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx@@ -1,50 +1,55 @@-import type { ComponentProps } from "react";import { push } from "react-router-redux";-import _ from "underscore";+import {+ skipToken,+ useGetTimelineQuery,+ useUpdateTimelineMutation,+} from "metabase/api";import { useSetArchive } from "metabase/common/hooks";-import { Timelines } from "metabase/entities/timelines";-import { connect, useDispatch } from "metabase/redux";-import type { State } from "metabase/redux/store";+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";+import { useDispatch } from "metabase/redux";import EditTimelineModal from "metabase/timelines/common/components/EditTimelineModal";import * as Urls from "metabase/urls";import type { Timeline } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import type { ModalParams } from "../../types";-interface EditTimelineModalProps {- params: ModalParams;-}+function EditTimelineModalContainer({ params, ...props }: ModalComponentProps) {+ const dispatch = useDispatch();+ const archive = useSetArchive();+ const [updateTimeline] = useUpdateTimelineMutation();+ const id = Urls.extractEntityId(params.timelineId);+ const {+ data: timeline,+ isLoading,+ error,+ } = useGetTimelineQuery(id != null ? { id, include: "events" } : skipToken);-const timelineProps = {- id: (state: State, props: EditTimelineModalProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events" },- LoadingAndErrorWrapper,-};+ if (isLoading || error || !timeline) {+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />+ );+ }-const mapDispatchToProps = (dispatch: any) => ({- onSubmit: async (timeline: Timeline) => {- await dispatch(Timelines.actions.update(timeline));+ const handleSubmit = async (timeline: Timeline) => {+ await updateTimeline(timeline).unwrap();dispatch(push(Urls.timelineInCollection(timeline)));- },-});+ };-function EditTimelineModalContainer(- props: ComponentProps<typeof EditTimelineModal>,-) {- const archive = useSetArchive();- const dispatch = useDispatch();- const onArchive = async (timeline: Timeline) => {+ const handleArchive = async (timeline: Timeline) => {await archive({ id: timeline.id, model: "timeline" }, true);dispatch(push(Urls.timelinesInCollection(timeline.collection)));};- return <EditTimelineModal {...props} onArchive={onArchive} />;++ return (+ <EditTimelineModal+ {...props}+ timeline={timeline}+ onSubmit={handleSubmit}+ onArchive={handleArchive}+ />+ );}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.load(timelineProps),- connect(null, mapDispatchToProps),-)(EditTimelineModalContainer);+export default EditTimelineModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsxindex 90e111c6e54..519d5581e8b 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -1,9 +1,11 @@import { push } from "react-router-redux";-import _ from "underscore";-import { skipToken, useGetTimelineEventQuery } from "metabase/api";+import {+ skipToken,+ useGetTimelineEventQuery,+ useListTimelinesQuery,+} from "metabase/api";import { Collections } from "metabase/entities/collections";-import { Timelines } from "metabase/entities/timelines";import { useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import MoveEventModal, {@@ -18,22 +20,17 @@ import type { ModalParams } from "../../types";interface OwnProps {params: ModalParams;+ onClose?: () => void;}-const timelinesProps = {- query: { include: "events" },- LoadingAndErrorWrapper,-};-const collectionProps = {id: (state: State, props: OwnProps) =>Urls.extractCollectionId(props.params.slug),LoadingAndErrorWrapper,};-type ContainerProps = Omit<MoveEventModalProps, "event" | "onSubmit"> & {- params: ModalParams;-};+type ContainerProps = Omit<MoveEventModalProps, "event" | "onSubmit"> &+ OwnProps;function MoveEventModalContainer({ params, ...props }: ContainerProps) {const setTimeline = useSetTimeline();@@ -41,9 +38,14 @@ function MoveEventModalContainer({ params, ...props }: ContainerProps) {const eventId = Urls.extractEntityId(params.timelineEventId);const {data: event,- isLoading,- error,+ isLoading: isEventLoading,+ error: eventError,} = useGetTimelineEventQuery(eventId ?? skipToken);+ const {+ data: timelines = [],+ isLoading: isTimelinesLoading,+ error: timelinesError,+ } = useListTimelinesQuery({ include: "events" });const handleSubmit = async (event: TimelineEvent,@@ -58,15 +60,22 @@ function MoveEventModalContainer({ params, ...props }: ContainerProps) {}};+ const isLoading = isEventLoading || isTimelinesLoading;+ const error = eventError ?? timelinesError;+if (isLoading || error || !event) {return <LoadingAndErrorWrapper loading={isLoading} error={error} />;}- return <MoveEventModal {...props} event={event} onSubmit={handleSubmit} />;+ return (+ <MoveEventModal+ {...props}+ event={event}+ timelines={timelines}+ onSubmit={handleSubmit}+ />+ );}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.loadList(timelinesProps),- Collections.load(collectionProps),-)(MoveEventModalContainer);+export default Collections.load(collectionProps)(MoveEventModalContainer);diff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsxindex e7a15ed6b8f..9133163eeb9 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx@@ -1,39 +1,35 @@import { useCallback } from "react";import { push } from "react-router-redux";-import _ from "underscore";-import { collectionApi, useGetCollectionQuery } from "metabase/api";+import {+ collectionApi,+ skipToken,+ useGetCollectionQuery,+ useGetTimelineQuery,+} from "metabase/api";import { useSetCollection } from "metabase/common/hooks";import { getDefaultTimelineName } from "metabase/common/utils/timelines";-import { Timelines } from "metabase/entities/timelines";+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";-import type { State } from "metabase/redux/store";import MoveTimelineModal from "metabase/timelines/common/components/MoveTimelineModal";import * as Urls from "metabase/urls";import type { CollectionId, Timeline } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import type { ModalParams } from "../../types";-interface MoveTimelineModalProps {- params: ModalParams;- timeline: Timeline;- onClose: () => void;-}--const timelineProps = {- id: (state: State, props: MoveTimelineModalProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events" },- LoadingAndErrorWrapper,-};--function MoveTimelineModalContainer(props: MoveTimelineModalProps) {+function MoveTimelineModalContainer({ params, ...props }: ModalComponentProps) {const dispatch = useDispatch();const setCollection = useSetCollection();- const { data: sourceCollection } = useGetCollectionQuery({- id: props.timeline.collection_id ?? "root",- });+ const id = Urls.extractEntityId(params.timelineId);+ const {+ data: timeline,+ isLoading,+ error,+ } = useGetTimelineQuery(id != null ? { id, include: "events" } : skipToken);++ const { data: sourceCollection } = useGetCollectionQuery(+ timeline ? { id: timeline.collection_id ?? "root" } : skipToken,+ );const handleSubmit = useCallback((timeline: Timeline, collectionId: CollectionId) => {@@ -68,10 +64,16 @@ function MoveTimelineModalContainer(props: MoveTimelineModalProps) {[dispatch, setCollection, sourceCollection],);- return <MoveTimelineModal {...props} onSubmit={handleSubmit} />;+ if (isLoading || error || !timeline) {+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />+ );+ }++ return (+ <MoveTimelineModal {...props} timeline={timeline} onSubmit={handleSubmit} />+ );}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(Timelines.load(timelineProps))(- MoveTimelineModalContainer,-);+export default MoveTimelineModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsxindex 69509875847..a652e05eb76 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx@@ -1,10 +1,12 @@import { push } from "react-router-redux";-import _ from "underscore";-import { useCreateTimelineEventMutation } from "metabase/api";-import { Timelines } from "metabase/entities/timelines";+import {+ skipToken,+ useCreateTimelineEventMutation,+ useGetTimelineQuery,+} from "metabase/api";+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";import { useDispatch } from "metabase/redux";-import type { State } from "metabase/redux/store";import NewEventModal from "metabase/timelines/common/components/NewEventModal";import * as Urls from "metabase/urls";import type {@@ -14,23 +16,22 @@ import type {} from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";-import type { ModalParams } from "../../types";-interface NewEventModalContainerProps {- params: ModalParams;- timeline: Timeline;-}--const timelineProps = {- id: (state: State, props: NewEventModalContainerProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events" },- LoadingAndErrorWrapper,-};--function NewEventModalContainer({ timeline }: NewEventModalContainerProps) {+function NewEventModalContainer({ params }: ModalComponentProps) {const dispatch = useDispatch();const [createTimelineEvent] = useCreateTimelineEventMutation();+ const id = Urls.extractEntityId(params.timelineId);+ const {+ data: timeline,+ isLoading,+ 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>,@@ -53,4 +54,4 @@ function NewEventModalContainer({ timeline }: NewEventModalContainerProps) {}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(Timelines.load(timelineProps))(NewEventModalContainer);+export default NewEventModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsxindex 46b3de42129..f56eec72faa 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx@@ -1,38 +1,64 @@import { push } from "react-router-redux";-import _ from "underscore";+import {+ useCreateTimelineEventMutation,+ useCreateTimelineMutation,+} from "metabase/api";+import { getDefaultTimeline } from "metabase/common/utils/timelines";import { Collections } from "metabase/entities/collections";-import { Timelines } from "metabase/entities/timelines";-import { connect } from "metabase/redux";+import { useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import NewEventModal from "metabase/timelines/common/components/NewEventModal";import * as Urls from "metabase/urls";-import type { Collection, TimelineEvent } from "metabase-types/api";+import type {+ Collection,+ CreateTimelineEventRequest,+ CreateTimelineRequest,+ TimelineEvent,+} from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import type { ModalParams } from "../../types";-interface NewEventWithTimelineModalProps {+interface NewEventWithTimelineModalContainerProps {params: ModalParams;+ onClose?: () => void;}const collectionProps = {- id: (state: State, props: NewEventWithTimelineModalProps) =>+ id: (state: State, props: NewEventWithTimelineModalContainerProps) =>Urls.extractCollectionId(props.params.slug),LoadingAndErrorWrapper,};-const mapDispatchToProps = (dispatch: any) => ({- onSubmit: async (values: Partial<TimelineEvent>, collection: Collection) => {- const query = { collectionId: collection.id, include: "events" };- await dispatch(Timelines.actions.createWithEvent(values, collection));- await dispatch(Timelines.actions.fetchList(query));+function NewEventWithTimelineModalContainer(+ props: NewEventWithTimelineModalContainerProps,+) {+ const dispatch = useDispatch();+ const [createTimeline] = useCreateTimelineMutation();+ const [createTimelineEvent] = useCreateTimelineEventMutation();++ const onSubmit = async (+ values: Partial<TimelineEvent>,+ collection?: Collection,+ ) => {+ if (!collection) {+ return;+ }+ const timeline = await createTimeline(+ getDefaultTimeline(collection) as CreateTimelineRequest,+ ).unwrap();+ await createTimelineEvent({+ ...values,+ timeline_id: timeline.id,+ } as CreateTimelineEventRequest).unwrap();dispatch(push(Urls.timelinesInCollection(collection)));- },-});+ };++ return <NewEventModal {...props} source="collections" onSubmit={onSubmit} />;+}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Collections.load(collectionProps),- connect(null, mapDispatchToProps),-)(NewEventModal);+export default Collections.load(collectionProps)(+ NewEventWithTimelineModalContainer,+);diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsxindex 0081b182ffb..fb9962d67fe 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx@@ -1,38 +1,45 @@import { push } from "react-router-redux";-import _ from "underscore";+import { useCreateTimelineMutation } from "metabase/api";import { Collections } from "metabase/entities/collections";-import { Timelines } from "metabase/entities/timelines";-import { connect } from "metabase/redux";+import { useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";import * as Urls from "metabase/urls";-import type { Timeline } from "metabase-types/api";+import type {+ Collection,+ CreateTimelineRequest,+ Timeline,+} from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import type { ModalParams } from "../../types";-interface NewTimelineModalProps {+interface NewTimelineModalContainerProps {params: ModalParams;+ collection: Collection;+ onClose?: () => void;}const collectionProps = {- id: (state: State, props: NewTimelineModalProps) =>+ id: (state: State, props: NewTimelineModalContainerProps) =>Urls.extractCollectionId(props.params.slug),LoadingAndErrorWrapper,};-const mapDispatchToProps = (dispatch: any) => ({- onSubmit: async (values: Partial<Timeline>) => {- const action = Timelines.actions.create(values);- const response = await dispatch(action);- const timeline = Timelines.HACK_getObjectFromAction(response);+function NewTimelineModalContainer(props: NewTimelineModalContainerProps) {+ const dispatch = useDispatch();+ const [createTimeline] = useCreateTimelineMutation();++ const onSubmit = async (values: Partial<Timeline>) => {+ const timeline = await createTimeline(+ values as CreateTimelineRequest,+ ).unwrap();dispatch(push(Urls.timelineInCollection(timeline)));- },-});+ };++ return <NewTimelineModal {...props} onSubmit={onSubmit} />;+}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Collections.load(collectionProps),- connect(null, mapDispatchToProps),-)(NewTimelineModal);+export default Collections.load(collectionProps)(NewTimelineModalContainer);diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsxindex b854369d12f..0b6cad1215c 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx@@ -1,50 +1,53 @@-import type { ComponentProps } from "react";import { push } from "react-router-redux";-import _ from "underscore";+import { skipToken, useGetTimelineQuery } from "metabase/api";import { useSetArchive } from "metabase/common/hooks";-import { Timelines } from "metabase/entities/timelines";-import { connect } from "metabase/redux";-import type { State } from "metabase/redux/store";+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";+import { useDispatch } from "metabase/redux";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 type { ModalParams } from "../../types";-interface TimelineArchiveModalProps {- params: ModalParams;-}--const timelineProps = {- id: (state: State, props: TimelineArchiveModalProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events", archived: true },- LoadingAndErrorWrapper,-};--const mapStateToProps = () => ({- isArchive: true,-});--const mapDispatchToProps = (dispatch: any) => ({- onGoBack: (timeline: Timeline) => {- dispatch(push(Urls.timelineInCollection(timeline)));- },-});--function TimelineArchiveModalContainer(- props: ComponentProps<typeof TimelineDetailsModal>,-) {+function TimelineArchiveModalContainer({+ params,+ ...props+}: ModalComponentProps) {+ const dispatch = useDispatch();const archive = useSetArchive();- const onUnarchive = (event: TimelineEvent) =>+ const id = Urls.extractEntityId(params.timelineId);+ const {+ data: timeline,+ isLoading,+ error,+ } = useGetTimelineQuery(+ 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);- return <TimelineDetailsModal {...props} onUnarchive={onUnarchive} />;++ const handleGoBack = (timeline: Timeline) => {+ dispatch(push(Urls.timelineInCollection(timeline)));+ };++ return (+ <TimelineDetailsModal+ {...props}+ timeline={timeline}+ isArchive+ onUnarchive={handleUnarchive}+ onGoBack={handleGoBack}+ />+ );}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.load(timelineProps),- connect(mapStateToProps, mapDispatchToProps),-)(TimelineArchiveModalContainer);+export default TimelineArchiveModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsxindex f20b4e3be4a..30ceec7510c 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -1,11 +1,12 @@-import type { ComponentProps } from "react";import { push } from "react-router-redux";-import _ from "underscore";+import {+ skipToken,+ useGetTimelineQuery,+ useListCollectionTimelinesQuery,+} from "metabase/api";import { useSetArchive } from "metabase/common/hooks";-import { Timelines } from "metabase/entities/timelines";-import { connect } from "metabase/redux";-import type { State } from "metabase/redux/store";+import { useDispatch } from "metabase/redux";import * as Urls from "metabase/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";@@ -13,48 +14,58 @@ import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import TimelineDetailsModal from "../../components/TimelineDetailsModal";import type { ModalParams } from "../../types";-interface TimelineDetailsModalProps {+interface TimelineDetailsModalContainerProps {params: ModalParams;- timelines: Timeline[];+ onClose?: () => void;}-const timelineProps = {- id: (state: State, props: TimelineDetailsModalProps) =>- Urls.extractEntityId(props.params.timelineId),- query: { include: "events" },- LoadingAndErrorWrapper,-};--const timelinesProps = {- query: (state: State, props: TimelineDetailsModalProps) => ({- collectionId: Urls.extractCollectionId(props.params.slug),- include: "events",- }),- LoadingAndErrorWrapper,-};--const mapStateToProps = (state: State, props: TimelineDetailsModalProps) => ({- isOnlyTimeline: props.timelines.length <= 1,-});--const mapDispatchToProps = (dispatch: any) => ({- onGoBack: (timeline: Timeline) => {- dispatch(push(Urls.timelinesInCollection(timeline.collection)));- },-});--function TimelineDetailsModalContainer(- props: ComponentProps<typeof TimelineDetailsModal>,-) {+function TimelineDetailsModalContainer({+ params,+ ...props+}: TimelineDetailsModalContainerProps) {+ const dispatch = useDispatch();const archive = useSetArchive();- const onArchive = (event: TimelineEvent) =>+ const id = Urls.extractEntityId(params.timelineId);+ const collectionId = Urls.extractCollectionId(params.slug);+ const {+ data: timeline,+ isLoading: isTimelineLoading,+ error: timelineError,+ } = useGetTimelineQuery(id != null ? { id, include: "events" } : skipToken);+ const {+ data: timelines = [],+ isLoading: isTimelinesLoading,+ error: timelinesError,+ } = useListCollectionTimelinesQuery(+ collectionId != null ? { id: collectionId, include: "events" } : skipToken,+ );++ 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);- return <TimelineDetailsModal {...props} onArchive={onArchive} />;++ const handleGoBack = (timeline: Timeline) => {+ dispatch(push(Urls.timelinesInCollection(timeline.collection)));+ };++ return (+ <TimelineDetailsModal+ {...props}+ timeline={timeline}+ isOnlyTimeline={timelines.length <= 1}+ onArchive={handleArchive}+ onGoBack={handleGoBack}+ />+ );}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.load(timelineProps),- Timelines.loadList(timelinesProps),- connect(mapStateToProps, mapDispatchToProps),-)(TimelineDetailsModalContainer);+export default TimelineDetailsModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsxindex 6a3b652d321..2dc39d09fc5 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx@@ -1,22 +1,38 @@-import { Timelines } from "metabase/entities/timelines";-import type { State } from "metabase/redux/store";+import { skipToken, useListCollectionTimelinesQuery } from "metabase/api";import * as Urls from "metabase/urls";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import TimelineIndexModal from "../../components/TimelineIndexModal";import type { ModalParams } from "../../types";-interface TimelineIndexModalProps {+interface TimelineIndexModalContainerProps {params: ModalParams;+ onClose?: () => void;}-const timelineProps = {- query: (state: State, props: TimelineIndexModalProps) => ({- collectionId: Urls.extractCollectionId(props.params.slug),- include: "events",- }),- LoadingAndErrorWrapper,-};+function TimelineIndexModalContainer({+ params,+ ...props+}: TimelineIndexModalContainerProps) {+ const collectionId = Urls.extractCollectionId(params.slug);+ const {+ data: timelines = [],+ isLoading,+ error,+ } = useListCollectionTimelinesQuery(+ collectionId != null ? { id: collectionId, include: "events" } : skipToken,+ );++ if (isLoading || error) {+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />+ );+ }++ return (+ <TimelineIndexModal {...props} params={params} timelines={timelines} />+ );+}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default Timelines.loadList(timelineProps)(TimelineIndexModal);+export default TimelineIndexModalContainer;diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsxindex 621f9760df5..1bcc3b82db3 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx@@ -1,11 +1,9 @@-import type { ComponentProps } from "react";import { push } from "react-router-redux";-import _ from "underscore";+import { skipToken, useListCollectionTimelinesQuery } from "metabase/api";import { useSetArchive } from "metabase/common/hooks";import { Collections } from "metabase/entities/collections";-import { Timelines } from "metabase/entities/timelines";-import { connect } from "metabase/redux";+import { useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import * as Urls from "metabase/urls";import type { Collection, Timeline } from "metabase-types/api";@@ -14,47 +12,60 @@ import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import TimelineListModal from "../../components/TimelineListModal";import type { ModalParams } from "../../types";-interface TimelineListArchiveModalProps {+interface TimelineListArchiveModalContainerProps {params: ModalParams;+ collection: Collection;+ onClose?: () => void;}-const timelineProps = {- query: (state: State, props: TimelineListArchiveModalProps) => ({- collectionId: Urls.extractCollectionId(props.params.slug),- archived: true,- include: "events",- }),- LoadingAndErrorWrapper,-};-const collectionProps = {- id: (state: State, props: TimelineListArchiveModalProps) =>+ id: (state: State, props: TimelineListArchiveModalContainerProps) =>Urls.extractCollectionId(props.params.slug),LoadingAndErrorWrapper,};-const mapStateToProps = () => ({- isArchive: true,-});+function TimelineListArchiveModalContainer({+ params,+ ...props+}: TimelineListArchiveModalContainerProps) {+ const dispatch = useDispatch();+ const archive = useSetArchive();+ const collectionId = Urls.extractCollectionId(params.slug);+ const {+ data: timelines = [],+ isLoading,+ error,+ } = useListCollectionTimelinesQuery(+ collectionId != null+ ? { id: collectionId, include: "events", archived: true }+ : skipToken,+ );-const mapDispatchToProps = (dispatch: any) => ({- onGoBack: (collection: Collection) => {- dispatch(push(Urls.timelinesInCollection(collection)));- },-});+ if (isLoading || error) {+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />+ );+ }-function TimelineListArchiveModalContainer(- props: ComponentProps<typeof TimelineListModal>,-) {- const archive = useSetArchive();const onUnarchive = (timeline: Timeline) =>archive({ id: timeline.id, model: "timeline" }, false);- return <TimelineListModal {...props} onUnarchive={onUnarchive} />;++ const onGoBack = (collection: Collection) => {+ dispatch(push(Urls.timelinesInCollection(collection)));+ };++ return (+ <TimelineListModal+ {...props}+ timelines={timelines}+ isArchive+ onUnarchive={onUnarchive}+ onGoBack={onGoBack}+ />+ );}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.loadList(timelineProps),- Collections.load(collectionProps),- connect(mapStateToProps, mapDispatchToProps),-)(TimelineListArchiveModalContainer);+export default Collections.load(collectionProps)(+ TimelineListArchiveModalContainer,+);diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsxindex 4e0abb809a7..009ab6f2ed7 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx@@ -1,34 +1,46 @@-import _ from "underscore";-+import { skipToken, useListCollectionTimelinesQuery } from "metabase/api";import { Collections } from "metabase/entities/collections";-import { Timelines } from "metabase/entities/timelines";import type { State } from "metabase/redux/store";import * as Urls from "metabase/urls";+import type { Collection } from "metabase-types/api";import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";import TimelineListModal from "../../components/TimelineListModal";import type { ModalParams } from "../../types";-interface TimelineListModalProps {+interface TimelineListModalContainerProps {params: ModalParams;+ collection: Collection;+ onClose?: () => void;}-const timelineProps = {- query: (state: State, props: TimelineListModalProps) => ({- collectionId: Urls.extractCollectionId(props.params.slug),- include: "events",- }),- LoadingAndErrorWrapper,-};-const collectionProps = {- id: (state: State, props: TimelineListModalProps) =>+ id: (state: State, props: TimelineListModalContainerProps) =>Urls.extractCollectionId(props.params.slug),LoadingAndErrorWrapper,};+function TimelineListModalContainer({+ params,+ ...props+}: TimelineListModalContainerProps) {+ const collectionId = Urls.extractCollectionId(params.slug);+ const {+ data: timelines = [],+ isLoading,+ error,+ } = useListCollectionTimelinesQuery(+ collectionId != null ? { id: collectionId, include: "events" } : skipToken,+ );++ if (isLoading || error) {+ return (+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />+ );+ }++ return <TimelineListModal {...props} timelines={timelines} />;+}+// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.loadList(timelineProps),- Collections.load(collectionProps),-)(TimelineListModal);+export default Collections.load(collectionProps)(TimelineListModalContainer);diff --git a/frontend/src/metabase/timelines/collections/types.ts b/frontend/src/metabase/timelines/collections/types.tsindex 1e7f0bc2f34..f020bf5d260 100644--- a/frontend/src/metabase/timelines/collections/types.ts+++ b/frontend/src/metabase/timelines/collections/types.ts@@ -5,7 +5,7 @@ export interface MenuItem {}export interface ModalParams {- slug: string;+ slug?: string;timelineId?: string;timelineEventId?: string;}diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsxindex b80cf4fff76..58497368413 100644--- a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx@@ -1,8 +1,5 @@-import _ from "underscore";--import { useGetTimelineEventQuery } from "metabase/api";+import { useGetTimelineEventQuery, useListTimelinesQuery } from "metabase/api";import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";-import { Timelines } from "metabase/entities/timelines";import type { State } from "metabase/redux/store";import MoveEventModal, {type MoveEventModalProps,@@ -16,10 +13,6 @@ interface OwnProps {onClose?: () => void;}-const timelinesProps = {- query: { include: "events" },-};-const collectionProps = {id: (state: State, props: OwnProps) => {return props.collectionId ?? ROOT_COLLECTION.id;@@ -28,7 +21,7 @@ const collectionProps = {type ContainerProps = Omit<MoveEventModalProps,- "event" | "onSubmit" | "onSubmitSuccess"+ "event" | "timelines" | "onSubmit" | "onSubmitSuccess"> & {eventId: number;onClose?: () => void;@@ -37,6 +30,7 @@ type ContainerProps = Omit<function MoveEventModalContainer({ eventId, ...props }: ContainerProps) {const setTimeline = useSetTimeline();const { data: event } = useGetTimelineEventQuery(eventId);+ const { data: timelines = [] } = useListTimelinesQuery({ include: "events" });const handleSubmit = async (event: TimelineEvent, newTimeline?: Timeline) => {if (newTimeline) {await setTimeline(event, newTimeline);@@ -51,6 +45,7 @@ function MoveEventModalContainer({ eventId, ...props }: ContainerProps) {<MoveEventModal{...props}event={event}+ timelines={timelines}onSubmit={handleSubmit}onSubmitSuccess={props.onClose}/>@@ -58,7 +53,4 @@ function MoveEventModalContainer({ eventId, ...props }: ContainerProps) {}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.loadList(timelinesProps),- Collections.load(collectionProps),-)(MoveEventModalContainer);+export default Collections.load(collectionProps)(MoveEventModalContainer);diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsxindex 26650e919e2..a2af967ded3 100644--- a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx@@ -1,9 +1,12 @@import { t } from "ttag";-import _ from "underscore";-import { useCreateTimelineEventMutation } from "metabase/api";+import {+ useCreateTimelineEventMutation,+ useCreateTimelineMutation,+ useListTimelinesQuery,+} from "metabase/api";+import { getDefaultTimeline } from "metabase/common/utils/timelines";import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";-import { Timelines } from "metabase/entities/timelines";import { useDispatch } from "metabase/redux";import type { State } from "metabase/redux/store";import { addUndo } from "metabase/redux/undo";@@ -11,7 +14,7 @@ import NewEventModal from "metabase/timelines/common/components/NewEventModal";import type {Collection,CreateTimelineEventRequest,- Timeline,+ CreateTimelineRequest,TimelineEvent,} from "metabase-types/api";@@ -19,14 +22,9 @@ interface NewEventModalContainerProps {cardId?: number;collectionId?: number;onClose?: () => void;- timelines?: Timeline[];collection?: Collection;}-const timelineProps = {- query: { include: "events" },-};-const collectionProps = {id: (state: State, props: NewEventModalContainerProps) => {return props.collectionId ?? ROOT_COLLECTION.id;@@ -35,11 +33,12 @@ const collectionProps = {function NewEventModalContainer({onClose,- timelines,collection,}: NewEventModalContainerProps) {const dispatch = useDispatch();+ const [createTimeline] = useCreateTimelineMutation();const [createTimelineEvent] = useCreateTimelineEventMutation();+ const { data: timelines = [] } = useListTimelinesQuery({ include: "events" });const onSubmit = async (values: Partial<TimelineEvent>,@@ -48,7 +47,13 @@ function NewEventModalContainer({if (values.timeline_id) {await createTimelineEvent(values as CreateTimelineEventRequest).unwrap();} else if (collection) {- await dispatch(Timelines.actions.createWithEvent(values, collection));+ const timeline = await createTimeline(+ getDefaultTimeline(collection) as CreateTimelineRequest,+ ).unwrap();+ await createTimelineEvent({+ ...values,+ timeline_id: timeline.id,+ } as CreateTimelineEventRequest).unwrap();}dispatch(addUndo({ message: t`Created event` }));};@@ -65,7 +70,4 @@ function NewEventModalContainer({}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Timelines.loadList(timelineProps),- Collections.load(collectionProps),-)(NewEventModalContainer);+export default Collections.load(collectionProps)(NewEventModalContainer);