diff --git a/packages/twenty-front/src/modules/object-record/record-store/states/selectors/recordStoreFieldValueSelector.ts b/packages/twenty-front/src/modules/object-record/record-store/states/selectors/recordStoreFieldValueSelector.ts index dc969cd74e..72ccbac62e 100644 --- a/packages/twenty-front/src/modules/object-record/record-store/states/selectors/recordStoreFieldValueSelector.ts +++ b/packages/twenty-front/src/modules/object-record/record-store/states/selectors/recordStoreFieldValueSelector.ts @@ -58,7 +58,10 @@ export const recordStoreFieldValueSelector = selectorFamily({ const relationType = morphRelations[0].type; if (relationType === RelationType.ONE_TO_MANY) { - return morphValuesWithObjectName as { + return morphValuesWithObjectName.map((morphValue) => ({ + ...morphValue, + value: morphValue.value ? morphValue.value : [], + })) as { objectNameSingular: string; value: ObjectRecord[]; }[]; diff --git a/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts b/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts index 5d0df98125..198e9392c6 100644 --- a/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts +++ b/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts @@ -27,7 +27,7 @@ export const prefillRecord = ({ fieldMetadataItem.relation?.type === RelationType.MANY_TO_ONE ) { const joinColumnValue = - input[fieldMetadataItem.settings?.joinColumnName]; + input[fieldMetadataItem.settings?.joinColumnName] ?? null; throwIfInputRelationDataIsInconsistent(input, fieldMetadataItem); return [