From 532e4342ecdb4fbc34df53c00a5e94179bff40bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tha=C3=AFs?= <guigon.thais@gmail.com>
Date: Wed, 22 Nov 2023 14:32:36 +0100
Subject: [PATCH] fix: fix viewing date fields detail pages (#2641)

Fixes #2640
---
 .../modules/settings/data-model/hooks/useFieldMetadataForm.ts | 1 +
 .../src/pages/settings/data-model/SettingsObjectFieldEdit.tsx | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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;