From b68f5cda97f4aed9cb569a42bbe76320bbd56346 Mon Sep 17 00:00:00 2001
From: Weiko <corentin@twenty.com>
Date: Fri, 8 Dec 2023 15:50:12 +0100
Subject: [PATCH] Fix relation between standard objects (#2878)

---
 .../SettingsObjectNewFieldStep2.tsx                |  4 ++--
 .../relation-metadata/relation-metadata.service.ts | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx b/front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
index 441102f0c..4c0d8ca50 100644
--- a/front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
+++ b/front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
@@ -142,7 +142,7 @@ export const SettingsObjectNewFieldStep2 = () => {
 
         objectViews.forEach(async (view) => {
           await createOneViewField?.({
-            view: view.id,
+            viewId: view.id,
             fieldMetadataId:
               validatedFormValues.relation.type === 'MANY_TO_ONE'
                 ? createdRelation.data?.createOneRelation.toFieldMetadataId
@@ -154,7 +154,7 @@ export const SettingsObjectNewFieldStep2 = () => {
         });
         relationObjectViews.forEach(async (view) => {
           await createOneViewField?.({
-            view: view.id,
+            viewId: view.id,
             fieldMetadataId:
               validatedFormValues.relation.type === 'MANY_TO_ONE'
                 ? createdRelation.data?.createOneRelation.fromFieldMetadataId
diff --git a/server/src/metadata/relation-metadata/relation-metadata.service.ts b/server/src/metadata/relation-metadata/relation-metadata.service.ts
index a14f3eafb..6ef059867 100644
--- a/server/src/metadata/relation-metadata/relation-metadata.service.ts
+++ b/server/src/metadata/relation-metadata/relation-metadata.service.ts
@@ -137,11 +137,11 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
         description: record.toDescription,
         icon: record.toIcon,
         isCustom: true,
-        targetColumnMap: isToCustom
-          ? {
-              value: createCustomColumnName(record.toName),
-            }
-          : {},
+        targetColumnMap: {
+          value: isToCustom
+            ? createCustomColumnName(record.toName)
+            : record.toName,
+        },
         isActive: true,
         type: FieldMetadataType.RELATION,
         objectMetadataId: record.toObjectMetadataId,
@@ -151,7 +151,9 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
       {
         name: baseColumnName,
         label: `${record.toLabel} Foreign Key`,
-        description: `${record.toDescription} Foreign Key`,
+        description: record.toDescription
+          ? `${record.toDescription} Foreign Key`
+          : undefined,
         icon: undefined,
         isCustom: true,
         targetColumnMap: {