From 3e8d42f2ed654b68b80766af5e4f2657ddd6b4d8 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Sat, 20 Apr 2024 19:29:42 +0200 Subject: [PATCH] Fix standard field ids of timelineActivities relations --- .../constants/standard-field-ids.ts | 8 +- .../constants/standard-object-ids.ts | 1 - .../standard-objects/event.object-metadata.ts | 105 ------------------ 3 files changed, 4 insertions(+), 110 deletions(-) delete mode 100644 packages/twenty-server/src/modules/event/standard-objects/event.object-metadata.ts diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts index 0363abc81..b07fda4eb 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids.ts @@ -122,7 +122,7 @@ export const companyStandardFieldIds = { opportunities: '20202020-add3-4658-8e23-d70dccb6d0ec', favorites: '20202020-4d1d-41ac-b13b-621631298d55', attachments: '20202020-c1b5-4120-b0f0-987ca401ed53', - timelineActivities: '72d5d7d3-8782-446c-a54b-1c25024f55db', + timelineActivities: '20202020-0414-4daf-9c0d-64fe7b27f89f', }; export const connectedAccountStandardFieldIds = { @@ -246,7 +246,7 @@ export const opportunityStandardFieldIds = { favorites: '20202020-a1c2-4500-aaae-83ba8a0e827a', activityTargets: '20202020-220a-42d6-8261-b2102d6eab35', attachments: '20202020-87c7-4118-83d6-2f4031005209', - timelineActivities: '863a6f5c-493a-47c8-9e14-34ed929d2ba6', + timelineActivities: '20202020-30e2-421f-96c7-19c69d1cf631', }; export const personStandardFieldIds = { @@ -266,7 +266,7 @@ export const personStandardFieldIds = { attachments: '20202020-cd97-451f-87fa-bcb789bdbf3a', messageParticipants: '20202020-498e-4c61-8158-fa04f0638334', calendarEventParticipants: '20202020-52ee-45e9-a702-b64b3753e3a9', - timelineActivities: 'f23d6471-78e0-458a-bdd0-9a84cd7d0b70', + timelineActivities: '20202020-a43e-4873-9c23-e522de906ce5', }; export const viewFieldStandardFieldIds = { @@ -327,7 +327,7 @@ export const workspaceMemberStandardFieldIds = { messageParticipants: '20202020-8f99-48bc-a5eb-edd33dd54188', blocklist: '20202020-6cb2-4161-9f29-a4b7f1283859', calendarEventParticipants: '20202020-0dbc-4841-9ce1-3e793b5b3512', - timelineActivities: '20202020-f0d9-4ba3-a123-69cc2c185071', + timelineActivities: '20202020-e15b-47b8-94fe-8200e3c66615', auditLogs: '20202020-2f54-4739-a5e2-99563385e83d', }; diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts index 9fb5b56bc..467167351 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids.ts @@ -19,7 +19,6 @@ export const standardObjectIds = { comment: '20202020-435f-4de9-89b5-97e32233bf5f', company: '20202020-b374-4779-a561-80086cb2e17f', connectedAccount: '20202020-977e-46b2-890b-c3002ddfd5c5', - event: '20202020-6736-4337-b5c4-8b39fae325a5', // Todo: remove favorite: '20202020-ab56-4e05-92a3-e2414a499860', auditLog: '20202020-0566-476a-b4c4-a0f9781bd80a', messageChannelMessageAssociation: '20202020-ad1e-4127-bccb-d83ae04d2ccb', diff --git a/packages/twenty-server/src/modules/event/standard-objects/event.object-metadata.ts b/packages/twenty-server/src/modules/event/standard-objects/event.object-metadata.ts deleted file mode 100644 index ed9f611dd..000000000 --- a/packages/twenty-server/src/modules/event/standard-objects/event.object-metadata.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface'; - -import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity'; -import { eventStandardFieldIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids'; -import { standardObjectIds } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids'; -import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata'; -import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface'; -import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator'; -import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator'; -import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator'; -import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator'; -import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator'; -import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata'; -import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata'; -import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata'; -import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata'; -import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata'; - -// TODO: Depricate -// This should be removed in the next release -// We use AuditLog and ActivityTimeline instead -@ObjectMetadata({ - standardId: standardObjectIds.event, - namePlural: 'events', - labelSingular: 'Event', - labelPlural: 'Events', - description: 'An event', - icon: 'IconJson', -}) -@IsSystem() -@IsNotAuditLogged() -export class EventObjectMetadata extends BaseObjectMetadata { - @FieldMetadata({ - standardId: eventStandardFieldIds.properties, - type: FieldMetadataType.TEXT, - label: 'Event name', - description: 'Event name/type', - icon: 'IconAbc', - }) - name: string; - - @FieldMetadata({ - standardId: eventStandardFieldIds.properties, - type: FieldMetadataType.RAW_JSON, - label: 'Event details', - description: 'Json value for event details', - icon: 'IconListDetails', - }) - @IsNullable() - properties: JSON; - - @FieldMetadata({ - standardId: eventStandardFieldIds.workspaceMember, - type: FieldMetadataType.RELATION, - label: 'Workspace Member', - description: 'Event workspace member', - icon: 'IconCircleUser', - joinColumn: 'workspaceMemberId', - }) - @IsNullable() - workspaceMember: Relation; - - @FieldMetadata({ - standardId: eventStandardFieldIds.person, - type: FieldMetadataType.RELATION, - label: 'Person', - description: 'Event person', - icon: 'IconUser', - joinColumn: 'personId', - }) - @IsNullable() - person: Relation; - - @FieldMetadata({ - standardId: eventStandardFieldIds.company, - type: FieldMetadataType.RELATION, - label: 'Company', - description: 'Event company', - icon: 'IconBuildingSkyscraper', - joinColumn: 'companyId', - }) - @IsNullable() - company: Relation; - - @FieldMetadata({ - standardId: eventStandardFieldIds.opportunity, - type: FieldMetadataType.RELATION, - label: 'Opportunity', - description: 'Events opportunity', - icon: 'IconTargetArrow', - joinColumn: 'opportunityId', - }) - @IsNullable() - opportunity: Relation; - - @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({ - standardId: eventStandardFieldIds.custom, - name: oppositeObjectMetadata.nameSingular, - label: oppositeObjectMetadata.labelSingular, - description: `Event ${oppositeObjectMetadata.labelSingular}`, - joinColumn: `${oppositeObjectMetadata.nameSingular}Id`, - icon: 'IconBuildingSkyscraper', - })) - custom: Relation; -}