Skip to content

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

UXW-2425 Add event timeline label (#66976)

Denis Berezin5f62734470a0
diff --git a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
index 6c417a2be96..863295e9831 100644
--- a/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
+++ b/frontend/src/metabase/timelines/common/components/EventForm/EventForm.tsx
@@ -1,5 +1,5 @@
import dayjs from "dayjs";
-import { useMemo } from "react";
+import { useCallback, useMemo } from "react";
import { t } from "ttag";
import * as Yup from "yup";
@@ -39,9 +39,13 @@ const EVENT_SCHEMA = Yup.object({
timestamp: Yup.string().required(Errors.required),
time_matters: Yup.boolean(),
icon: Yup.string().required(Errors.required),
- timeline_id: Yup.number(),
+ timeline_id: Yup.string(),
});
+type TimelineEventFormData = Omit<TimelineEventData, "timeline_id"> & {
+ timeline_id: string | undefined;
+};
+
export interface EventFormOwnProps {
initialValues: TimelineEventData;
timelines?: Timeline[];
@@ -78,14 +82,31 @@ const EventForm = ({
}));
}, [timelines]);
+ const preparedInitialValues: TimelineEventFormData = {
+ ...initialValues,
+ timestamp: initialValues.timestamp || dayjs().utc(true).toISOString(),
+ timeline_id: initialValues.timeline_id
+ ? String(initialValues.timeline_id)
+ : undefined,
+ };
+
+ const handleSubmit = useCallback(
+ (values: TimelineEventFormData) => {
+ return onSubmit({
+ ...values,
+ timeline_id: values.timeline_id
+ ? parseInt(values.timeline_id, 10)
+ : undefined,
+ });
+ },
+ [onSubmit],
+ );
+
return (
<FormProvider
- initialValues={{
- ...initialValues,
- timestamp: initialValues.timestamp || dayjs().utc(true).toISOString(),
- }}
+ initialValues={preparedInitialValues}
validationSchema={EVENT_SCHEMA}
- onSubmit={onSubmit}
+ onSubmit={handleSubmit}
>
{({ dirty, values, setFieldValue }) => (
<Form disabled={!dirty} data-testid="event-form">
@@ -165,10 +186,10 @@ const EventForm = ({
</Group>
)}
/>
- {timelines.length > 1 && (
+ {timelines?.length > 1 && (
<FormSelect
name="timeline_id"
- title={t`Timeline`}
+ label={t`Timeline`}
data={timelineOptions}
/>
)}