From c7ad6a0de70144fbe671553090e4489bef0572bb Mon Sep 17 00:00:00 2001 From: Weiko Date: Tue, 23 Jan 2024 19:56:42 +0100 Subject: [PATCH] [messaging] Rename body to text (#3595) * Store HTML message * remove console log * [messaging] rename body to text * use CoreObjectNameSingular --- .../src/modules/activities/emails/components/Threads.tsx | 7 ++++--- .../src/core/messaging/timeline-messaging.service.ts | 6 +++--- .../messaging/services/messaging-utils.service.ts | 2 +- .../standard-objects/message.object-metadata.ts | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/twenty-front/src/modules/activities/emails/components/Threads.tsx b/packages/twenty-front/src/modules/activities/emails/components/Threads.tsx index d1f78b505..db14d6418 100644 --- a/packages/twenty-front/src/modules/activities/emails/components/Threads.tsx +++ b/packages/twenty-front/src/modules/activities/emails/components/Threads.tsx @@ -5,6 +5,7 @@ import { ThreadPreview } from '@/activities/emails/components/ThreadPreview'; import { getTimelineThreadsFromCompanyId } from '@/activities/emails/queries/getTimelineThreadsFromCompanyId'; import { getTimelineThreadsFromPersonId } from '@/activities/emails/queries/getTimelineThreadsFromPersonId'; import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity'; +import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { H1Title, H1TitleFontColor, @@ -31,12 +32,12 @@ const StyledEmailCount = styled.span` export const Threads = ({ entity }: { entity: ActivityTargetableObject }) => { const threadQuery = - entity.targetObjectNameSingular === 'person' + entity.targetObjectNameSingular === CoreObjectNameSingular.Person ? getTimelineThreadsFromPersonId : getTimelineThreadsFromCompanyId; const threadQueryVariables = - entity.targetObjectNameSingular === 'person' + entity.targetObjectNameSingular === CoreObjectNameSingular.Person ? { personId: entity.id } : { companyId: entity.id }; @@ -50,7 +51,7 @@ export const Threads = ({ entity }: { entity: ActivityTargetableObject }) => { const timelineThreads: TimelineThread[] = threads.data[ - entity.targetObjectNameSingular === 'Person' + entity.targetObjectNameSingular === CoreObjectNameSingular.Person ? 'getTimelineThreadsFromPersonId' : 'getTimelineThreadsFromCompanyId' ]; diff --git a/packages/twenty-server/src/core/messaging/timeline-messaging.service.ts b/packages/twenty-server/src/core/messaging/timeline-messaging.service.ts index 46784068e..ca932a922 100644 --- a/packages/twenty-server/src/core/messaging/timeline-messaging.service.ts +++ b/packages/twenty-server/src/core/messaging/timeline-messaging.service.ts @@ -30,7 +30,7 @@ export class TimelineMessagingService { subquery.*, message_count, last_message_subject, - last_message_body, + last_message_text, last_message_received_at, last_message_participant_handle, last_message_participant_displayName @@ -39,7 +39,7 @@ export class TimelineMessagingService { mt.*, COUNT(m."id") OVER (PARTITION BY mt."id") AS message_count, FIRST_VALUE(m."subject") OVER (PARTITION BY mt."id" ORDER BY m."receivedAt" DESC) AS last_message_subject, - FIRST_VALUE(m."body") OVER (PARTITION BY mt."id" ORDER BY m."receivedAt" DESC) AS last_message_body, + FIRST_VALUE(m."text") OVER (PARTITION BY mt."id" ORDER BY m."receivedAt" DESC) AS last_message_text, FIRST_VALUE(m."receivedAt") OVER (PARTITION BY mt."id" ORDER BY m."receivedAt" DESC) AS last_message_received_at, FIRST_VALUE(mr."handle") OVER (PARTITION BY mt."id" ORDER BY m."receivedAt" DESC) AS last_message_participant_handle, FIRST_VALUE(mr."displayName") OVER (PARTITION BY mt."id" ORDER BY m."receivedAt" DESC) AS last_message_participant_displayName, @@ -69,7 +69,7 @@ export class TimelineMessagingService { senderPictureUrl: '', numberOfMessagesInThread: messageThread.message_count, subject: messageThread.last_message_subject, - body: messageThread.last_message_body, + body: messageThread.last_message_text, receivedAt: messageThread.last_message_received_at, }; }); diff --git a/packages/twenty-server/src/workspace/messaging/services/messaging-utils.service.ts b/packages/twenty-server/src/workspace/messaging/services/messaging-utils.service.ts index ae00615c7..ecfd50bea 100644 --- a/packages/twenty-server/src/workspace/messaging/services/messaging-utils.service.ts +++ b/packages/twenty-server/src/workspace/messaging/services/messaging-utils.service.ts @@ -91,7 +91,7 @@ export class MessagingUtilsService { const receivedAt = new Date(parseInt(message.internalDate)); await manager.query( - `INSERT INTO ${dataSourceMetadata.schema}."message" ("id", "headerMessageId", "subject", "receivedAt", "direction", "messageThreadId", "body", "html") VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`, + `INSERT INTO ${dataSourceMetadata.schema}."message" ("id", "headerMessageId", "subject", "receivedAt", "direction", "messageThreadId", "text", "html") VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`, [ newMessageId, message.headerMessageId, diff --git a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata.ts b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata.ts index f46e825a8..614ef53b9 100644 --- a/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata.ts +++ b/packages/twenty-server/src/workspace/workspace-sync-metadata/standard-objects/message.object-metadata.ts @@ -64,11 +64,11 @@ export class MessageObjectMetadata extends BaseObjectMetadata { @FieldMetadata({ type: FieldMetadataType.TEXT, - label: 'Body', - description: 'Body', + label: 'Text', + description: 'Text', icon: 'IconMessage', }) - body: string; + text: string; @FieldMetadata({ type: FieldMetadataType.TEXT,