diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/RelationFromManyFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/RelationFromManyFieldDisplay.tsx index 7b20f91e1..05bf1c181 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/RelationFromManyFieldDisplay.tsx +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/RelationFromManyFieldDisplay.tsx @@ -13,7 +13,8 @@ import { isDefined } from 'twenty-shared/utils'; import { pascalCase } from '~/utils/string/pascalCase'; export const RelationFromManyFieldDisplay = () => { - const { fieldValue, fieldDefinition } = useRelationFromManyFieldDisplay(); + const { fieldValue, fieldDefinition, generateRecordChipData } = + useRelationFromManyFieldDisplay(); const { isFocused } = useFieldFocus(); const { disableChipClick } = useContext(FieldContext); @@ -99,14 +100,17 @@ export const RelationFromManyFieldDisplay = () => { } else { return ( - {fieldValue.filter(isDefined).map((record) => ( - - ))} + {fieldValue.filter(isDefined).map((record) => { + const recordChipData = generateRecordChipData(record); + return ( + + ); + })} ); } diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts index 27d026853..901ced0fb 100644 --- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts +++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts @@ -60,9 +60,8 @@ export const useRelationFromManyFieldDisplay = () => { : (record: ObjectRecord) => generateDefaultRecordChipData({ record, - // @ts-expect-error Above assertions does not infer that fieldDefinition.metadata.objectMetadataNameSingular always defined objectNameSingular: - fieldDefinition.metadata.objectMetadataNameSingular, + fieldDefinition.metadata.relationObjectMetadataNameSingular, }); return { diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx index 11243ea42..0f08e83ae 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx @@ -102,7 +102,7 @@ export const SettingsDataModelFieldPreview = ({ fieldMetadataItem.name || `${fieldMetadataItem.type}-new-field`; const recordId = previewRecord?.id ?? - `${objectMetadataItem.nameSingular}-${fieldName}-${fieldMetadataItem.relationDefinition?.direction}-preview`; + `${objectMetadataItem.nameSingular}-${fieldName}-${fieldMetadataItem.relationDefinition?.direction}-${relationObjectMetadataItem?.nameSingular}-preview`; return ( <>