diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx index f0d7f4bdc8..f475ce1b76 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx @@ -117,7 +117,7 @@ export const settingsDataModelFieldSettingsFormSchema = z.discriminatedUnion( type SettingsDataModelFieldSettingsFormCardProps = { fieldMetadataItem: Pick< FieldMetadataItem, - 'icon' | 'label' | 'type' | 'isCustom' + 'icon' | 'label' | 'type' | 'isCustom' | 'settings' > & Partial>; } & Pick; diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextSettingsFormCard.tsx index 7dea460046..1f3c4f3951 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextSettingsFormCard.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/text/SettingsDataModelFieldTextSettingsFormCard.tsx @@ -8,6 +8,7 @@ import { SettingsDataModelFieldPreviewCard, SettingsDataModelFieldPreviewCardProps, } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard'; +import { useFormContext } from 'react-hook-form'; type SettingsDataModelFieldTextSettingsFormCardProps = { disabled?: boolean; @@ -26,11 +27,16 @@ export const SettingsDataModelFieldTextSettingsFormCard = ({ fieldMetadataItem, objectMetadataItem, }: SettingsDataModelFieldTextSettingsFormCardProps) => { + const { watch } = useFormContext(); + return ( } diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberSettingsFormCard.tsx index edea86760f..3a0ef61a3c 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberSettingsFormCard.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberSettingsFormCard.tsx @@ -7,12 +7,13 @@ import { SettingsDataModelFieldPreviewCard, SettingsDataModelFieldPreviewCardProps, } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard'; +import { useFormContext } from 'react-hook-form'; type SettingsDataModelFieldNumberSettingsFormCardProps = { disabled?: boolean; fieldMetadataItem: Pick< FieldMetadataItem, - 'icon' | 'label' | 'type' | 'defaultValue' + 'icon' | 'label' | 'type' | 'defaultValue' | 'settings' >; } & Pick; @@ -26,11 +27,18 @@ export const SettingsDataModelFieldNumberSettingsFormCard = ({ fieldMetadataItem, objectMetadataItem, }: SettingsDataModelFieldNumberSettingsFormCardProps) => { + const { watch } = useFormContext(); + return ( } diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx index 3f47131204..3ccfb6e15f 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx @@ -227,6 +227,7 @@ export const SettingsObjectNewFieldConfigure = () => { fieldMetadataItem={{ icon: formConfig.watch('icon'), label: formConfig.watch('label') || 'New Field', + settings: formConfig.watch('settings') || null, type: fieldType as FieldMetadataType, }} objectMetadataItem={activeObjectMetadataItem}