From 8cf3262eb340c636e1e76520e98d269aba1b2a18 Mon Sep 17 00:00:00 2001
From: Weiko <corentin@twenty.com>
Date: Fri, 11 Oct 2024 17:11:45 +0200
Subject: [PATCH] fix enum default value update when option deleted (#7604)

Fix as isDefined also returns false if value is null and we still want
to allow users to set defaultValue back to null
---
 .../engine/core-modules/open-api/utils/parameters.utils.ts | 3 +--
 .../field-metadata/field-metadata.service.ts               | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts
index 9cb95402c..f16c6fe43 100644
--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/parameters.utils.ts
@@ -84,8 +84,7 @@ export const computeFilterParameters = (): OpenAPIV3_1.ParameterObject => {
     ).join('**, **')}**.  
     Default root conjunction is **${DEFAULT_CONJUNCTION}**.  
     To filter **null** values use **field[is]:NULL** or **field[is]:NOT_NULL**  
-    To filter using **boolean** values use **field[eq]:true** or **field[eq]:false**
-    `,
+    To filter using **boolean** values use **field[eq]:true** or **field[eq]:false**`,
 
     required: false,
     schema: {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
index d38872cf4..f402f5b0b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
@@ -394,9 +394,10 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
 
       const fieldMetadataForUpdate = {
         ...updatableFieldInput,
-        defaultValue: isDefined(updatableFieldInput.defaultValue)
-          ? updatableFieldInput.defaultValue
-          : existingFieldMetadata.defaultValue,
+        defaultValue:
+          updatableFieldInput.defaultValue !== undefined
+            ? updatableFieldInput.defaultValue
+            : existingFieldMetadata.defaultValue,
       };
 
       this.validateFieldMetadata<UpdateFieldInput>(