diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts index 6de5f3bb5b..6a1a92642c 100644 --- a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts +++ b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts @@ -31,8 +31,12 @@ export const useTimelineActivities = ( const hasTimelineActivityField = timelineActivityMetadata.fields.some( (field) => - field.relation?.targetObjectMetadata?.nameSingular === - targetableObject.targetObjectNameSingular, + isDefined(field.morphRelations) && + field.morphRelations.some( + (morphRelation) => + morphRelation.targetObjectMetadata?.nameSingular === + targetableObject.targetObjectNameSingular, + ), ); const { recordGqlFields: depthOneRecordGqlFields } = diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-relation-field-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-relation-field-flat-metadata.util.ts index 251cf34ca3..da570b2377 100644 --- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-relation-field-flat-metadata.util.ts +++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-relation-field-flat-metadata.util.ts @@ -3,7 +3,7 @@ import { type FieldMetadataDefaultOption, type FieldMetadataDefaultValueForAnyType, type FieldMetadataSettings, - FieldMetadataType, + type FieldMetadataType, } from 'twenty-shared/types'; import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type'; @@ -70,6 +70,7 @@ export const createStandardRelationFieldFlatMetadata = < settings, options: fieldOptions = null, morphId, + type, }, standardObjectMetadataRelatedEntityIds, twentyStandardApplicationId, @@ -89,7 +90,7 @@ export const createStandardRelationFieldFlatMetadata = < applicationId: twentyStandardApplicationId, workspaceId, objectMetadataId: standardObjectMetadataRelatedEntityIds[objectName].id, - type: FieldMetadataType.RELATION, + type, name: fieldName.toString(), label, description,