diff --git a/front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx b/front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx index 19ab4a044..e4a669af1 100644 --- a/front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx +++ b/front/src/modules/settings/data-model/components/SettingsObjectFieldRelationForm.tsx @@ -18,6 +18,7 @@ export type SettingsObjectFieldRelationFormValues = Partial<{ }>; type SettingsObjectFieldRelationFormProps = { + disableFieldEdition?: boolean; disableRelationEdition?: boolean; onChange: (values: SettingsObjectFieldRelationFormValues) => void; values?: SettingsObjectFieldRelationFormValues; @@ -46,6 +47,7 @@ const StyledInputsContainer = styled.div` `; export const SettingsObjectFieldRelationForm = ({ + disableFieldEdition, disableRelationEdition, onChange, values, @@ -96,6 +98,7 @@ export const SettingsObjectFieldRelationForm = ({ @@ -106,6 +109,7 @@ export const SettingsObjectFieldRelationForm = ({ variant="primary" /> { diff --git a/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx b/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx index f8c717f75..cf83840c7 100644 --- a/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx +++ b/front/src/modules/settings/data-model/components/SettingsObjectFieldTypeSelectSection.tsx @@ -27,7 +27,7 @@ type SettingsObjectFieldTypeSelectSectionProps = { excludedFieldTypes?: FieldMetadataType[]; fieldMetadata: Pick & { id?: string }; onChange: (values: SettingsObjectFieldTypeSelectSectionFormValues) => void; - relationFieldMetadataId?: string; + relationFieldMetadata?: Pick; values?: SettingsObjectFieldTypeSelectSectionFormValues; } & Pick; @@ -50,7 +50,7 @@ export const SettingsObjectFieldTypeSelectSection = ({ fieldMetadata, objectMetadataId, onChange, - relationFieldMetadataId, + relationFieldMetadata, values, }: SettingsObjectFieldTypeSelectSectionProps) => { const relationFormConfig = values?.relation; @@ -116,7 +116,7 @@ export const SettingsObjectFieldTypeSelectSection = ({ label: relationFormConfig.field?.label || 'Field name', type: FieldMetadataType.Relation, - id: relationFieldMetadataId, + id: relationFieldMetadata?.id, }} shrink objectMetadataId={relationFormConfig.objectMetadataId} @@ -129,7 +129,10 @@ export const SettingsObjectFieldTypeSelectSection = ({ form={ values.type === FieldMetadataType.Relation && ( onChange({ diff --git a/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx index 155c7e9bf..62a76039a 100644 --- a/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx +++ b/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx @@ -157,7 +157,7 @@ export const SettingsObjectFieldEdit = () => { }} objectMetadataId={activeObjectMetadataItem.id} onChange={handleFormChange} - relationFieldMetadataId={relationFieldMetadataItem?.id} + relationFieldMetadata={relationFieldMetadataItem} values={{ type: formValues.type, relation: formValues.relation,