From e9a7a8a4a36dd553a9f780a13fe3413758e7c15a Mon Sep 17 00:00:00 2001 From: mritosa <100703401+mritosa@users.noreply.github.com> Date: Wed, 15 May 2024 19:14:57 +0200 Subject: [PATCH] Fix missing team member images in calendar event (#5414) ### Work Fixed issue: #5308 ### Before Team member images are absent from Calendar events participant chips. ![Before](https://github.com/twentyhq/twenty/assets/100703401/bd3408ad-4a07-430e-ba23-83cd0775492a) ### After Screenshot 2024-05-14 at 10 53 24 ### Fix explained Redefined recordGqlField to fech Person and WorkspaceMember --------- Co-authored-by: Charles Bochet --- .../FindOneCalendarEventOperationSignature.ts | 33 +++++++++++++++++++ .../components/RightDrawerCalendarEvent.tsx | 6 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 packages/twenty-front/src/modules/activities/calendar/graphql/operation-signatures/FindOneCalendarEventOperationSignature.ts diff --git a/packages/twenty-front/src/modules/activities/calendar/graphql/operation-signatures/FindOneCalendarEventOperationSignature.ts b/packages/twenty-front/src/modules/activities/calendar/graphql/operation-signatures/FindOneCalendarEventOperationSignature.ts new file mode 100644 index 000000000..20639aaf9 --- /dev/null +++ b/packages/twenty-front/src/modules/activities/calendar/graphql/operation-signatures/FindOneCalendarEventOperationSignature.ts @@ -0,0 +1,33 @@ +import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; +import { RecordGqlOperationSignature } from '@/object-record/graphql/types/RecordGqlOperationSignature'; + +export const FIND_ONE_CALENDAR_EVENT_OPERATION_SIGNATURE: RecordGqlOperationSignature = + { + objectNameSingular: CoreObjectNameSingular.CalendarEvent, + variables: {}, + fields: { + conferenceLink: true, + description: true, + endsAt: true, + externalCreatedAt: true, + id: true, + isCanceled: true, + isFullDay: true, + location: true, + startsAt: true, + title: true, + visibility: true, + calendarEventParticipants: { + id: true, + person: true, + workspaceMember: true, + isOrganizer: true, + responseStatus: true, + handle: true, + createdAt: true, + calendarEventId: true, + updatedAt: true, + displayName: true, + }, + }, + }; diff --git a/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx b/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx index 845885e7c..0134713a1 100644 --- a/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx +++ b/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx @@ -1,9 +1,9 @@ import { useRecoilValue } from 'recoil'; import { CalendarEventDetails } from '@/activities/calendar/components/CalendarEventDetails'; +import { FIND_ONE_CALENDAR_EVENT_OPERATION_SIGNATURE } from '@/activities/calendar/graphql/operation-signatures/FindOneCalendarEventOperationSignature'; import { viewableCalendarEventIdState } from '@/activities/calendar/states/viewableCalendarEventIdState'; import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent'; -import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord'; import { useSetRecordInStore } from '@/object-record/record-store/hooks/useSetRecordInStore'; @@ -11,8 +11,10 @@ export const RightDrawerCalendarEvent = () => { const { setRecords } = useSetRecordInStore(); const viewableCalendarEventId = useRecoilValue(viewableCalendarEventIdState); const { record: calendarEvent } = useFindOneRecord({ - objectNameSingular: CoreObjectNameSingular.CalendarEvent, + objectNameSingular: + FIND_ONE_CALENDAR_EVENT_OPERATION_SIGNATURE.objectNameSingular, objectRecordId: viewableCalendarEventId ?? '', + recordGqlFields: FIND_ONE_CALENDAR_EVENT_OPERATION_SIGNATURE.fields, onCompleted: (record) => setRecords([record]), });