diff --git a/front/src/modules/settings/data-model/hooks/useFieldMetadataForm.ts b/front/src/modules/settings/data-model/hooks/useFieldMetadataForm.ts index 6cbf49f79..1fdf060ed 100644 --- a/front/src/modules/settings/data-model/hooks/useFieldMetadataForm.ts +++ b/front/src/modules/settings/data-model/hooks/useFieldMetadataForm.ts @@ -134,6 +134,7 @@ export const useFieldMetadataForm = () => { hasFormChanged: hasFieldFormChanged || hasRelationFormChanged, hasRelationFormChanged, initForm, + isInitialized, isValid: validationResult.success, validatedFormValues: validationResult.success ? validationResult.data diff --git a/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx index 62a76039a..fc268002e 100644 --- a/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx +++ b/front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx @@ -49,6 +49,7 @@ export const SettingsObjectFieldEdit = () => { hasFormChanged, hasRelationFormChanged, initForm, + isInitialized, isValid, validatedFormValues, } = useFieldMetadataForm(); @@ -84,7 +85,8 @@ export const SettingsObjectFieldEdit = () => { relationType, ]); - if (!activeObjectMetadataItem || !activeMetadataField) return null; + if (!isInitialized || !activeObjectMetadataItem || !activeMetadataField) + return null; const canSave = isValid && hasFormChanged;