From 600df4fd907557a22f2cf545df89fac94aa0c0fc Mon Sep 17 00:00:00 2001
From: Thomas Trompette <thomas.trompette@sfr.fr>
Date: Tue, 29 Jul 2025 17:38:10 +0200
Subject: [PATCH] Reset relation id to null rather than empty string (#13488)

Empty string rases an error "invalid uuid".
When resetting a relation field - no value or deleting variable - we
should set null rather than an empty string. Otherwise the user that set
a relation field once in a workflow step has to always keep a value set.
---
 .../components/FormSingleRecordPicker.tsx        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx
index 7561ccdf78..4de268b38a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSingleRecordPicker.tsx
@@ -16,6 +16,7 @@ import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-sta
 import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString';
 import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { isNonEmptyString } from '@sniptt/guards';
 import { useCallback, useId } from 'react';
 import { isDefined, isValidUuid } from 'twenty-shared/utils';
 import { IconChevronDown, IconForbid } from 'twenty-ui/display';
@@ -60,7 +61,7 @@ type FormSingleRecordPickerValue =
 export type FormSingleRecordPickerProps = {
   label?: string;
   defaultValue?: RecordId | Variable;
-  onChange: (value: RecordId | Variable) => void;
+  onChange: (value: RecordId | Variable | null) => void;
   objectNameSingular: string;
   disabled?: boolean;
   testId?: string;
@@ -117,7 +118,16 @@ export const FormSingleRecordPicker = ({
   const handleRecordSelected = (
     selectedEntity: SingleRecordPickerRecord | null | undefined,
   ) => {
-    onChange?.(selectedEntity?.record?.id ?? '');
+    if (
+      !isDefined(selectedEntity?.record?.id) ||
+      !isNonEmptyString(selectedEntity.record?.id)
+    ) {
+      onChange(null);
+
+      return;
+    }
+
+    onChange(selectedEntity.record.id);
     closeDropdown(dropdownId);
   };
 
@@ -128,7 +138,7 @@ export const FormSingleRecordPicker = ({
   const handleUnlinkVariable = (event?: React.MouseEvent<HTMLDivElement>) => {
     // Prevents the dropdown to open when clicking on the chip
     event?.stopPropagation();
-    onChange('');
+    onChange(null);
   };
 
   const setRecordPickerSelectedId = useSetRecoilComponentStateV2(