The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Stop fetching unused morph targets in the timeline query (#24269)
Félix Malfait2dfe24dcb2ff
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.tsindex e648f130d7d..b951e9aae71 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@@ -2,11 +2,12 @@ import { useCallback, useMemo } from 'react';import { useLinkedObjectsTitle } from '@/activities/timeline-activities/hooks/useLinkedObjectsTitle';import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';+import { getTimelineActivityRecordGqlFields } from '@/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields';import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';import { useListenToObjectRecordOperationBrowserEvent } from '@/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { useGenerateDepthRecordGqlFieldsFromObject } from '@/object-record/graphql/record-gql-fields/hooks/useGenerateDepthRecordGqlFieldsFromObject';+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';import { useListenToEventsForQuery } from '@/sse-db-event/hooks/useListenToEventsForQuery';import {@@ -35,6 +36,8 @@ export const useTimelineActivities = (});const { objectMetadataItems } = useFilteredObjectMetadataItems();+ const { objectMetadataItems: allObjectMetadataItems } =+ useObjectMetadataItems();const noteObjectMetadataItem = objectMetadataItems.find((objectMetadataItem) =>@@ -56,11 +59,14 @@ export const useTimelineActivities = (),);- const { recordGqlFields: depthOneRecordGqlFields } =- useGenerateDepthRecordGqlFieldsFromObject({- objectNameSingular: CoreObjectNameSingular.TimelineActivity,- depth: 1,- });+ const recordGqlFields = useMemo(+ () =>+ getTimelineActivityRecordGqlFields({+ objectMetadataItems: allObjectMetadataItems,+ fields: timelineActivityMetadata.fields,+ }),+ [allObjectMetadataItems, timelineActivityMetadata.fields],+ );const {records: timelineActivities,@@ -76,7 +82,7 @@ export const useTimelineActivities = (createdAt: 'DescNullsFirst',},],- recordGqlFields: depthOneRecordGqlFields,+ recordGqlFields,fetchPolicy: 'cache-and-network',});diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityRecordGqlFields.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityRecordGqlFields.test.tsnew file mode 100644index 00000000000..ca5e6d8b848--- /dev/null+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityRecordGqlFields.test.ts@@ -0,0 +1,40 @@+import { getTimelineActivityRecordGqlFields } from '@/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields';+import { FieldMetadataType } from 'twenty-shared/types';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';++describe('getTimelineActivityRecordGqlFields', () => {+ const timelineActivityObjectMetadataItem =+ getMockObjectMetadataItemOrThrow('timelineActivity');++ const recordGqlFields = getTimelineActivityRecordGqlFields({+ objectMetadataItems: getTestEnrichedObjectMetadataItemsMock(),+ fields: timelineActivityObjectMetadataItem.fields,+ });++ it('should not request any morph target relation', () => {+ const morphRelationFieldNames = timelineActivityObjectMetadataItem.fields+ .filter((field) => field.type === FieldMetadataType.MORPH_RELATION)+ .map((field) => field.name);++ expect(morphRelationFieldNames).not.toHaveLength(0);++ expect(+ Object.keys(recordGqlFields).filter((gqlFieldName) =>+ gqlFieldName.startsWith('target'),+ ),+ ).toEqual([]);+ });++ it('should keep the scalars and the author relation the timeline renders', () => {+ expect(recordGqlFields).toMatchObject({+ name: true,+ properties: true,+ linkedRecordId: true,+ linkedObjectMetadataId: true,+ linkedRecordCachedName: true,+ workspaceMemberId: true,+ workspaceMember: expect.any(Object),+ });+ });+});diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.tsnew file mode 100644index 00000000000..43867911e32--- /dev/null+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts@@ -0,0 +1,24 @@+import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/types/RecordGqlFields';+import {+ generateDepthRecordGqlFieldsFromFields,+ type GenerateDepthRecordGqlFieldsFromFields,+} from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';+import { FieldMetadataType } from 'twenty-shared/types';++type GetTimelineActivityRecordGqlFieldsParams = Pick<+ GenerateDepthRecordGqlFieldsFromFields,+ 'objectMetadataItems' | 'fields'+>;++// Timeline rows render scalars and the author only, and the server resolves every requested morph target with its own relation query.+export const getTimelineActivityRecordGqlFields = ({+ objectMetadataItems,+ fields,+}: GetTimelineActivityRecordGqlFieldsParams): RecordGqlFields =>+ generateDepthRecordGqlFieldsFromFields({+ objectMetadataItems,+ fields: fields.filter(+ (field) => field.type !== FieldMetadataType.MORPH_RELATION,+ ),+ depth: 1,+ });