Skip to content

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

Remove `timeline-event` entity (#73629)

Romeo Van Snick86879d2feced
diff --git a/frontend/src/metabase/api/timeline-event.ts b/frontend/src/metabase/api/timeline-event.ts
index b4b6823a6d4..d9c74ae54d3 100644
--- a/frontend/src/metabase/api/timeline-event.ts
+++ b/frontend/src/metabase/api/timeline-event.ts
@@ -1,4 +1,3 @@
-import { TimelineEventSchema } from "metabase/schema";
import type {
CreateTimelineEventRequest,
TimelineEvent,
@@ -14,7 +13,6 @@ import {
provideTimelineEventTags,
tag,
} from "./tags";
-import { hydrateLegacyEntities } from "./utils/hydrate-legacy-entities";
export const timelineEventApi = Api.injectEndpoints({
endpoints: (builder) => ({
@@ -24,7 +22,6 @@ export const timelineEventApi = Api.injectEndpoints({
url: `/api/timeline-event/${id}`,
}),
providesTags: (event) => (event ? provideTimelineEventTags(event) : []),
- onQueryStarted: hydrateLegacyEntities(TimelineEventSchema),
}),
createTimelineEvent: builder.mutation<
TimelineEvent,
@@ -38,6 +35,7 @@ export const timelineEventApi = Api.injectEndpoints({
invalidatesTags: (event, error) =>
invalidateTags(error, [
listTag("timeline-event"),
+ tag("timeline"),
...(event ? [idTag("timeline", event.timeline_id)] : []),
]),
}),
diff --git a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
index ef9cdd935c3..13deec844cf 100644
--- a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
+++ b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
@@ -54,7 +54,6 @@ export type EntityType =
| "snippetCollections"
| "snippets"
| "tables"
- | "timelineEvents"
| "timelines"
| "users";
diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.ts
index 18c4f198faa..e6e982c4fe3 100644
--- a/frontend/src/metabase/entities/index.ts
+++ b/frontend/src/metabase/entities/index.ts
@@ -75,7 +75,6 @@ export { Dashboards as dashboards } from "./dashboards";
export { Questions as questions } from "./questions";
export { Timelines as timelines } from "./timelines";
-export { TimelineEvents as timelineEvents } from "./timeline-events";
export { Bookmarks as bookmarks } from "./bookmarks";
export { Databases as databases } from "./databases";
diff --git a/frontend/src/metabase/entities/timeline-events.js b/frontend/src/metabase/entities/timeline-events.js
deleted file mode 100644
index ee73f945b7e..00000000000
--- a/frontend/src/metabase/entities/timeline-events.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { timelineEventApi, useGetTimelineEventQuery } from "metabase/api";
-import { TimelineEventSchema } from "metabase/schema";
-
-import { createEntity, entityCompatibleQuery } from "./utils";
-
-/**
- * @deprecated use "metabase/api" instead
- */
-export const TimelineEvents = createEntity({
- name: "timelineEvents",
- nameOne: "timelineEvent",
- path: "/api/timeline-event",
- schema: TimelineEventSchema,
-
- rtk: () => ({
- getUseGetQuery: () => ({
- useGetQuery,
- }),
- }),
-
- api: {
- list: () => {
- throw new TypeError("TimelineEvents.api.list is not supported");
- },
- get: (entityQuery, options, dispatch) =>
- entityCompatibleQuery(
- entityQuery.id,
- dispatch,
- timelineEventApi.endpoints.getTimelineEvent,
- ),
- create: (entityQuery, dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- timelineEventApi.endpoints.createTimelineEvent,
- ),
- update: (entityQuery, dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- timelineEventApi.endpoints.updateTimelineEvent,
- ),
- delete: ({ id }, dispatch) =>
- entityCompatibleQuery(
- id,
- dispatch,
- timelineEventApi.endpoints.deleteTimelineEvent,
- ),
- },
-});
-
-const useGetQuery = ({ id }, options) => {
- return useGetTimelineEventQuery(id, options);
-};
diff --git a/frontend/src/metabase/entities/timelines.js b/frontend/src/metabase/entities/timelines.js
index 530729b1ed6..de82cdca809 100644
--- a/frontend/src/metabase/entities/timelines.js
+++ b/frontend/src/metabase/entities/timelines.js
@@ -1,6 +1,3 @@
-import { updateIn } from "icepick";
-import _ from "underscore";
-
import {
skipToken,
timelineApi,
@@ -12,7 +9,6 @@ import {
import { getDefaultTimeline } from "metabase/common/utils/timelines";
import { TimelineSchema } from "metabase/schema";
-import { TimelineEvents } from "./timeline-events";
import { createEntity, entityCompatibleQuery } from "./utils";
/**
@@ -80,50 +76,8 @@ export const Timelines = createEntity({
);
dispatch({ type: Timelines.actionTypes.INVALIDATE_LISTS_ACTION });
- dispatch({ type: TimelineEvents.actionTypes.INVALIDATE_LISTS_ACTION });
},
},
-
- reducer: (state = {}, action) => {
- if (action.type === TimelineEvents.actionTypes.CREATE && !action.error) {
- const event = TimelineEvents.HACK_getObjectFromAction(action);
-
- return updateIn(state, [event.timeline_id, "events"], (eventIds = []) => {
- return [...eventIds, event.id];
- });
- }
-
- if (action.type === TimelineEvents.actionTypes.UPDATE && !action.error) {
- const event = TimelineEvents.HACK_getObjectFromAction(action);
-
- return _.mapObject(state, (timeline) => {
- const hasEvent = timeline.events?.includes(event.id);
- const hasTimeline = event.timeline_id === timeline.id;
-
- return updateIn(timeline, ["events"], (eventIds = []) => {
- if (hasEvent && !hasTimeline) {
- return _.without(eventIds, event.id);
- } else if (!hasEvent && hasTimeline) {
- return [...eventIds, event.id];
- } else {
- return eventIds;
- }
- });
- });
- }
-
- if (action.type === TimelineEvents.actionTypes.DELETE && !action.error) {
- const eventId = action.payload.result;
-
- return _.mapObject(state, (timeline) => {
- return updateIn(timeline, ["events"], (eventIds = []) => {
- return _.without(eventIds, eventId);
- });
- });
- }
-
- return state;
- },
});
function useListQuery({ collectionId, ...params } = {}, options) {
diff --git a/frontend/src/metabase/query_builder/reducers.ts b/frontend/src/metabase/query_builder/reducers.ts
index 65e992124c2..4d43d16d5ae 100644
--- a/frontend/src/metabase/query_builder/reducers.ts
+++ b/frontend/src/metabase/query_builder/reducers.ts
@@ -5,10 +5,10 @@ import _ from "underscore";
import {
createCardPublicLink,
deleteCardPublicLink,
+ timelineEventApi,
updateCardEmbeddingParams,
updateCardEnableEmbedding,
} from "metabase/api";
-import { TimelineEvents } from "metabase/entities/timeline-events";
import { EDIT_QUESTION, NAVIGATE_TO_NEW_CARD } from "metabase/redux/dashboard";
import {
API_UPDATE_QUESTION,
@@ -601,14 +601,11 @@ export const visibleTimelineEventIds = createReducer<number[]>(
return state.filter((eventId) => !eventIdsToHide.includes(eventId));
},
)
- .addCase<
- string,
- { type: string; payload: { timelineEvent: { id: number } } }
- >(TimelineEvents.actionTypes.CREATE, (state, action) => [
- ...state,
- action.payload.timelineEvent.id,
- ])
- .addCase(RESET_QB, () => []);
+ .addCase(RESET_QB, () => [])
+ .addMatcher(
+ timelineEventApi.endpoints.createTimelineEvent.matchFulfilled,
+ (state, action) => [...state, action.payload.id],
+ );
},
);
diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.js
index d64d66785d0..bcca917a382 100644
--- a/frontend/src/metabase/schema.js
+++ b/frontend/src/metabase/schema.js
@@ -73,7 +73,6 @@ 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");
-export const TimelineEventSchema = new schema.Entity("timelineEvents");
DatabaseSchema.define({
tables: [TableSchema],
@@ -119,7 +118,6 @@ MeasureSchema.define({
TimelineSchema.define({
collection: CollectionSchema,
- events: [TimelineEventSchema],
});
CacheConfigSchema.define({});
diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx
index c1af642e879..fd1fea25dcb 100644
--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx
@@ -1,9 +1,14 @@
import { push } from "react-router-redux";
import _ from "underscore";
-import { TimelineEvents } from "metabase/entities/timeline-events";
+import {
+ skipToken,
+ useDeleteTimelineEventMutation,
+ useGetTimelineEventQuery,
+} from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/redux";
+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";
@@ -11,32 +16,45 @@ import type { Timeline, TimelineEvent } from "metabase-types/api";
import type { ModalParams } from "../../types";
-interface DeleteEventModalProps {
+interface DeleteEventModalContainerProps {
params: ModalParams;
+ timeline: Timeline;
}
const timelineProps = {
- id: (state: State, props: DeleteEventModalProps) =>
+ id: (state: State, props: DeleteEventModalContainerProps) =>
Urls.extractEntityId(props.params.timelineId),
query: { include: "events" },
};
-const timelineEventProps = {
- id: (state: State, props: DeleteEventModalProps) =>
- Urls.extractEntityId(props.params.timelineEventId),
- entityAlias: "event",
-};
+function DeleteEventModalContainer({
+ params,
+ timeline,
+}: DeleteEventModalContainerProps) {
+ const dispatch = useDispatch();
+ const eventId = Urls.extractEntityId(params.timelineEventId);
+ const {
+ data: event,
+ isLoading,
+ error,
+ } = useGetTimelineEventQuery(eventId ?? skipToken);
+ const [deleteTimelineEvent] = useDeleteTimelineEventMutation();
-const mapDispatchToProps = (dispatch: any) => ({
- onSubmit: async (event: TimelineEvent, timeline: Timeline) => {
- await dispatch(TimelineEvents.actions.delete(event));
+ const onSubmit = async (event: TimelineEvent, timeline: Timeline) => {
+ await deleteTimelineEvent(event.id).unwrap();
dispatch(push(Urls.timelineArchiveInCollection(timeline)));
- },
-});
+ };
+
+ if (isLoading || error || !event) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ }
+
+ return (
+ <DeleteEventModal event={event} timeline={timeline} onSubmit={onSubmit} />
+ );
+}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default _.compose(
- Timelines.load(timelineProps),
- TimelineEvents.load(timelineEventProps),
- connect(null, mapDispatchToProps),
-)(DeleteEventModal);
+export default _.compose(Timelines.load(timelineProps))(
+ DeleteEventModalContainer,
+);
diff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx
index 5bc0dc4b63a..a65f6e708a5 100644
--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx
@@ -1,11 +1,14 @@
-import type { ComponentProps } from "react";
import { push } from "react-router-redux";
import _ from "underscore";
+import {
+ skipToken,
+ useGetTimelineEventQuery,
+ useUpdateTimelineEventMutation,
+} from "metabase/api";
import { useSetArchive } from "metabase/common/hooks";
-import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect, useDispatch } from "metabase/redux";
+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";
@@ -14,48 +17,61 @@ import type { Timeline, TimelineEvent } from "metabase-types/api";
import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";
import type { ModalParams } from "../../types";
-interface EditEventModalProps {
+interface EditEventModalContainerProps {
params: ModalParams;
+ timeline?: Timeline;
}
const timelineProps = {
- id: (state: State, props: EditEventModalProps) =>
+ id: (state: State, props: EditEventModalContainerProps) =>
Urls.extractEntityId(props.params.timelineId),
query: { include: "events" },
LoadingAndErrorWrapper,
};
-const timelineEventProps = {
- id: (state: State, props: EditEventModalProps) =>
- Urls.extractEntityId(props.params.timelineEventId),
- entityAlias: "event",
- LoadingAndErrorWrapper,
-};
+function EditEventModalContainer({
+ params,
+ timeline,
+}: EditEventModalContainerProps) {
+ const dispatch = useDispatch();
+ const archive = useSetArchive();
+ const eventId = Urls.extractEntityId(params.timelineEventId);
+ const {
+ data: event,
+ isLoading,
+ error,
+ } = useGetTimelineEventQuery(eventId ?? skipToken);
+ const [updateTimelineEvent] = useUpdateTimelineEventMutation();
-const mapDispatchToProps = (dispatch: any) => ({
- onSubmit: async (event: TimelineEvent, timeline?: Timeline) => {
- await dispatch(TimelineEvents.actions.update(event));
+ const onSubmit = async (event: TimelineEvent, timeline?: Timeline) => {
+ await updateTimelineEvent(event).unwrap();
if (timeline) {
dispatch(push(Urls.timelineInCollection(timeline)));
}
- },
-});
+ };
-function EditEventModalContainer(props: ComponentProps<typeof EditEventModal>) {
- const archive = useSetArchive();
- const dispatch = useDispatch();
const onArchive = async (event: TimelineEvent, timeline?: Timeline) => {
await archive({ id: event.id, model: "timeline-event" }, true);
if (timeline) {
dispatch(push(Urls.timelineInCollection(timeline)));
}
};
- return <EditEventModal {...props} onArchive={onArchive} />;
+
+ if (isLoading || error || !event) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ }
+
+ return (
+ <EditEventModal
+ event={event}
+ timeline={timeline}
+ onSubmit={onSubmit}
+ onArchive={onArchive}
+ />
+ );
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default _.compose(
- Timelines.load(timelineProps),
- TimelineEvents.load(timelineEventProps),
- connect(null, mapDispatchToProps),
-)(EditEventModalContainer);
+export default _.compose(Timelines.load(timelineProps))(
+ EditEventModalContainer,
+);
diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
index c211bd5e83f..90e111c6e54 100644
--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
@@ -1,8 +1,8 @@
import { push } from "react-router-redux";
import _ from "underscore";
+import { skipToken, useGetTimelineEventQuery } from "metabase/api";
import { Collections } from "metabase/entities/collections";
-import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
import { useDispatch } from "metabase/redux";
import type { State } from "metabase/redux/store";
@@ -25,22 +25,26 @@ const timelinesProps = {
LoadingAndErrorWrapper,
};
-const timelineEventProps = {
- id: (state: State, props: OwnProps) =>
- Urls.extractEntityId(props.params.timelineEventId),
- entityAlias: "event",
- LoadingAndErrorWrapper,
-};
-
const collectionProps = {
id: (state: State, props: OwnProps) =>
Urls.extractCollectionId(props.params.slug),
LoadingAndErrorWrapper,
};
-function MoveEventModalContainer(props: Omit<MoveEventModalProps, "onSubmit">) {
+type ContainerProps = Omit<MoveEventModalProps, "event" | "onSubmit"> & {
+ params: ModalParams;
+};
+
+function MoveEventModalContainer({ params, ...props }: ContainerProps) {
const setTimeline = useSetTimeline();
const dispatch = useDispatch();
+ const eventId = Urls.extractEntityId(params.timelineEventId);
+ const {
+ data: event,
+ isLoading,
+ error,
+ } = useGetTimelineEventQuery(eventId ?? skipToken);
+
const handleSubmit = async (
event: TimelineEvent,
newTimeline?: Timeline,
@@ -53,12 +57,16 @@ function MoveEventModalContainer(props: Omit<MoveEventModalProps, "onSubmit">) {
dispatch(push(Urls.timelineInCollection(oldTimeline)));
}
};
- return <MoveEventModal {...props} onSubmit={handleSubmit} />;
+
+ if (isLoading || error || !event) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ }
+
+ return <MoveEventModal {...props} event={event} onSubmit={handleSubmit} />;
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default _.compose(
Timelines.loadList(timelinesProps),
- TimelineEvents.load(timelineEventProps),
Collections.load(collectionProps),
)(MoveEventModalContainer);
diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx
index 13a87280d8f..69509875847 100644
--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx
@@ -1,47 +1,56 @@
import { push } from "react-router-redux";
import _ from "underscore";
-import { TimelineEvents } from "metabase/entities/timeline-events";
+import { useCreateTimelineEventMutation } from "metabase/api";
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, Timeline, TimelineEvent } from "metabase-types/api";
+import type {
+ CreateTimelineEventRequest,
+ Timeline,
+ TimelineEvent,
+} from "metabase-types/api";
import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";
import type { ModalParams } from "../../types";
-interface NewEventModalProps {
+interface NewEventModalContainerProps {
params: ModalParams;
timeline: Timeline;
}
const timelineProps = {
- id: (state: State, props: NewEventModalProps) =>
+ id: (state: State, props: NewEventModalContainerProps) =>
Urls.extractEntityId(props.params.timelineId),
query: { include: "events" },
LoadingAndErrorWrapper,
};
-const mapStateToProps = (state: State, { timeline }: NewEventModalProps) => ({
- source: "collections",
- timelines: [timeline],
-});
+function NewEventModalContainer({ timeline }: NewEventModalContainerProps) {
+ const dispatch = useDispatch();
+ const [createTimelineEvent] = useCreateTimelineEventMutation();
-const mapDispatchToProps = (dispatch: any) => ({
- onSubmit: async (
+ const onSubmit = async (
values: Partial<TimelineEvent>,
- collection: Collection,
- timeline: Timeline,
+ _collection?: unknown,
+ timeline?: Timeline,
) => {
- await dispatch(TimelineEvents.actions.create(values));
- dispatch(push(Urls.timelineInCollection(timeline)));
- },
-});
+ await createTimelineEvent(values as CreateTimelineEventRequest).unwrap();
+ if (timeline) {
+ dispatch(push(Urls.timelineInCollection(timeline)));
+ }
+ };
+
+ return (
+ <NewEventModal
+ source="collections"
+ timelines={[timeline]}
+ onSubmit={onSubmit}
+ />
+ );
+}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default _.compose(
- Timelines.load(timelineProps),
- connect(mapStateToProps, mapDispatchToProps),
-)(NewEventModal);
+export default _.compose(Timelines.load(timelineProps))(NewEventModalContainer);
diff --git a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx
index 05cad98599a..e4b1c968274 100644
--- a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx
@@ -1,47 +1,51 @@
-import type { ComponentProps } from "react";
import { t } from "ttag";
-import _ from "underscore";
+import {
+ useGetTimelineEventQuery,
+ useUpdateTimelineEventMutation,
+} from "metabase/api";
import { useSetArchive } from "metabase/common/hooks";
-import { TimelineEvents } from "metabase/entities/timeline-events";
-import { connect } from "metabase/redux";
-import type { State } from "metabase/redux/store";
+import { useDispatch } from "metabase/redux";
import { addUndo } from "metabase/redux/undo";
import EditEventModal from "metabase/timelines/common/components/EditEventModal";
import type { TimelineEvent } from "metabase-types/api";
-interface EditEventModalProps {
+interface EditEventModalContainerProps {
eventId: number;
onClose?: () => void;
}
-const timelineEventProps = {
- id: (state: State, props: EditEventModalProps) => props.eventId,
- entityAlias: "event",
-};
+function EditEventModalContainer({
+ eventId,
+ onClose,
+}: EditEventModalContainerProps) {
+ const dispatch = useDispatch();
+ const archive = useSetArchive();
+ const { data: event } = useGetTimelineEventQuery(eventId);
+ const [updateTimelineEvent] = useUpdateTimelineEventMutation();
-const mapStateToProps = (state: State, { onClose }: EditEventModalProps) => ({
- onSubmitSuccess: onClose,
- onArchiveSuccess: onClose,
- onCancel: onClose,
-});
+ if (!event) {
+ return null;
+ }
-const mapDispatchToProps = (dispatch: any) => ({
- onSubmit: async (event: TimelineEvent) => {
- await dispatch(TimelineEvents.actions.update(event));
+ const onSubmit = async (event: TimelineEvent) => {
+ await updateTimelineEvent(event).unwrap();
dispatch(addUndo({ message: t`Updated event` }));
- },
-});
+ };
-function EditEventModalContainer(props: ComponentProps<typeof EditEventModal>) {
- const archive = useSetArchive();
const onArchive = (event: TimelineEvent) =>
archive({ id: event.id, model: "timeline-event" }, true);
- return <EditEventModal {...props} onArchive={onArchive} />;
+
+ return (
+ <EditEventModal
+ event={event}
+ onSubmit={onSubmit}
+ onSubmitSuccess={onClose}
+ onArchive={onArchive}
+ onArchiveSuccess={onClose}
+ />
+ );
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default _.compose(
- TimelineEvents.load(timelineEventProps),
- connect(mapStateToProps, mapDispatchToProps),
-)(EditEventModalContainer);
+export default EditEventModalContainer;
diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
index e2240202113..b80cf4fff76 100644
--- a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
@@ -1,7 +1,7 @@
import _ from "underscore";
+import { useGetTimelineEventQuery } from "metabase/api";
import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
-import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
import type { State } from "metabase/redux/store";
import MoveEventModal, {
@@ -20,29 +20,37 @@ const timelinesProps = {
query: { include: "events" },
};
-const timelineEventProps = {
- id: (state: State, props: OwnProps) => props.eventId,
- entityAlias: "event",
-};
-
const collectionProps = {
id: (state: State, props: OwnProps) => {
return props.collectionId ?? ROOT_COLLECTION.id;
},
};
-type ContainerProps = Omit<MoveEventModalProps, "onSubmit" | "onSubmitSuccess">;
+type ContainerProps = Omit<
+ MoveEventModalProps,
+ "event" | "onSubmit" | "onSubmitSuccess"
+> & {
+ eventId: number;
+ onClose?: () => void;
+};
-function MoveEventModalContainer(props: ContainerProps) {
+function MoveEventModalContainer({ eventId, ...props }: ContainerProps) {
const setTimeline = useSetTimeline();
+ const { data: event } = useGetTimelineEventQuery(eventId);
const handleSubmit = async (event: TimelineEvent, newTimeline?: Timeline) => {
if (newTimeline) {
await setTimeline(event, newTimeline);
}
};
+
+ if (!event) {
+ return null;
+ }
+
return (
<MoveEventModal
{...props}
+ event={event}
onSubmit={handleSubmit}
onSubmitSuccess={props.onClose}
/>
@@ -52,6 +60,5 @@ function MoveEventModalContainer(props: ContainerProps) {
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default _.compose(
Timelines.loadList(timelinesProps),
- TimelineEvents.load(timelineEventProps),
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.tsx
index 53e95f41cd6..26650e919e2 100644
--- a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
@@ -1,19 +1,26 @@
import { t } from "ttag";
import _ from "underscore";
+import { useCreateTimelineEventMutation } from "metabase/api";
import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
-import { TimelineEvents } from "metabase/entities/timeline-events";
import { Timelines } from "metabase/entities/timelines";
-import { connect } from "metabase/redux";
+import { useDispatch } from "metabase/redux";
import type { State } from "metabase/redux/store";
import { addUndo } from "metabase/redux/undo";
import NewEventModal from "metabase/timelines/common/components/NewEventModal";
-import type { Collection, TimelineEvent } from "metabase-types/api";
+import type {
+ Collection,
+ CreateTimelineEventRequest,
+ Timeline,
+ TimelineEvent,
+} from "metabase-types/api";
-interface NewEventModalProps {
+interface NewEventModalContainerProps {
cardId?: number;
collectionId?: number;
onClose?: () => void;
+ timelines?: Timeline[];
+ collection?: Collection;
}
const timelineProps = {
@@ -21,32 +28,44 @@ const timelineProps = {
};
const collectionProps = {
- id: (state: State, props: NewEventModalProps) => {
+ id: (state: State, props: NewEventModalContainerProps) => {
return props.collectionId ?? ROOT_COLLECTION.id;
},
};
-const mapStateToProps = (state: State, { onClose }: NewEventModalProps) => ({
- source: "question",
- onSubmitSuccess: onClose,
- onCancel: onClose,
-});
+function NewEventModalContainer({
+ onClose,
+ timelines,
+ collection,
+}: NewEventModalContainerProps) {
+ const dispatch = useDispatch();
+ const [createTimelineEvent] = useCreateTimelineEventMutation();
-const mapDispatchToProps = (dispatch: any) => ({
- onSubmit: async (values: Partial<TimelineEvent>, collection: Collection) => {
+ const onSubmit = async (
+ values: Partial<TimelineEvent>,
+ collection?: Collection,
+ ) => {
if (values.timeline_id) {
- await dispatch(TimelineEvents.actions.create(values));
- } else {
+ await createTimelineEvent(values as CreateTimelineEventRequest).unwrap();
+ } else if (collection) {
await dispatch(Timelines.actions.createWithEvent(values, collection));
}
-
dispatch(addUndo({ message: t`Created event` }));
- },
-});
+ };
+
+ return (
+ <NewEventModal
+ source="question"
+ timelines={timelines}
+ collection={collection}
+ onSubmit={onSubmit}
+ onSubmitSuccess={onClose}
+ />
+ );
+}
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default _.compose(
Timelines.loadList(timelineProps),
Collections.load(collectionProps),
- connect(mapStateToProps, mapDispatchToProps),
-)(NewEventModal);
+)(NewEventModalContainer);