Skip to content

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

Fix timeline form icon input (#71199)

Romeo Van Snickc009e259070b
diff --git a/e2e/test/scenarios/organization/timelines-collection.cy.spec.js b/e2e/test/scenarios/organization/timelines-collection.cy.spec.js
index 0da0f5a0dfd..88afe999fe5 100644
--- a/e2e/test/scenarios/organization/timelines-collection.cy.spec.js
+++ b/e2e/test/scenarios/organization/timelines-collection.cy.spec.js
@@ -345,6 +345,11 @@ describe("scenarios > organization > timelines > collection", () => {
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("New timeline").click();
cy.findByLabelText("Name").type("Launches");
+
+ cy.findByLabelText("Default icon").click();
+ H.popover().findByText("Cake").should("be.visible").click();
+ cy.findByLabelText("Default icon").should("have.value", "Cake");
+
// eslint-disable-next-line metabase/no-unscoped-text-selectors -- deprecated usage
cy.findByText("Create").click();
cy.wait("@createTimeline");
diff --git a/frontend/src/metabase/lib/timelines.ts b/frontend/src/metabase/lib/timelines.ts
index f2ac916f7c5..32109204df8 100644
--- a/frontend/src/metabase/lib/timelines.ts
+++ b/frontend/src/metabase/lib/timelines.ts
@@ -11,15 +11,21 @@ export const getTimelineName = (timeline: Timeline) => {
: timeline.name;
};
-export const getTimelineIcons = (): { label: string; value: IconName }[] => {
- return [
- { label: t`Star`, value: "star" },
- { label: t`Cake`, value: "cake" },
- { label: t`Mail`, value: "mail" },
- { label: t`Warning`, value: "warning" },
- { label: t`Bell`, value: "bell" },
- { label: t`Cloud`, value: "cloud" },
- ];
+export const getTimelineIcons = (): {
+ label: string;
+ value: IconName;
+ icon: IconName;
+}[] => {
+ return (
+ [
+ { label: t`Star`, value: "star" },
+ { label: t`Cake`, value: "cake" },
+ { label: t`Mail`, value: "mail" },
+ { label: t`Warning`, value: "warning" },
+ { label: t`Bell`, value: "bell" },
+ { label: t`Cloud`, value: "cloud" },
+ ] as const
+ ).map((item) => ({ ...item, icon: item.value }));
};
export const getDefaultTimeline = (
diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/IconField.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/IconField.tsx
new file mode 100644
index 00000000000..41f3b25cda8
--- /dev/null
+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/IconField.tsx
@@ -0,0 +1,32 @@
+import { useField } from "formik";
+
+import { useUniqueId } from "metabase/common/hooks/use-unique-id";
+import { FormField } from "metabase/forms";
+import { Icon, Select, type SelectOption } from "metabase/ui";
+
+export function IconField({
+ name,
+ title,
+ options,
+}: {
+ name: string;
+ title: string;
+ options: SelectOption[];
+}) {
+ const id = useUniqueId();
+ const [{ value, onBlur }, { error, touched }, { setValue }] = useField(name);
+
+ return (
+ <FormField title={title} htmlFor={id} error={touched ? error : undefined}>
+ <Select
+ id={id}
+ name={name}
+ value={value}
+ onChange={setValue}
+ onBlur={onBlur}
+ data={options}
+ leftSection={<Icon name={value} />}
+ />
+ </FormField>
+ );
+}
diff --git a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx
index ef02dc570a0..97679d4eea4 100644
--- a/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx
+++ b/frontend/src/metabase/timelines/common/components/TimelineForm/TimelineForm.tsx
@@ -5,7 +5,6 @@ import * as Yup from "yup";
import { Button } from "metabase/common/components/Button";
import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";
import { FormInput } from "metabase/common/components/FormInput";
-import { FormSelect } from "metabase/common/components/FormSelect";
import { FormSubmitButton } from "metabase/common/components/FormSubmitButton";
import { FormTextArea } from "metabase/common/components/FormTextArea";
import { Form, FormProvider } from "metabase/forms";
@@ -15,6 +14,7 @@ import type { TimelineData } from "metabase-types/api";
import FormArchiveButton from "../FormArchiveButton";
+import { IconField } from "./IconField";
import { TimelineFormFooter } from "./TimelineForm.styled";
const TIMELINE_SCHEMA = Yup.object({
@@ -54,7 +54,7 @@ const TimelineForm = ({
autoFocus
/>
<FormTextArea name="description" title={t`Description`} nullable />
- <FormSelect name="icon" title={t`Default icon`} options={icons} />
+ <IconField name="icon" title={t`Default icon`} options={icons} />
<TimelineFormFooter>
<FormErrorMessage inline />
{!isNew && (