The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Make the timeline happensAt mapping timeline activity type metadata (#24970)
Félix Malfaitc201bc1775ef
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 83883381ac0..e8893fd9bd4 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -3287,6 +3287,7 @@ enum MetadataTranslationProvenance {type TimelineActivityTypeEmitThrough {relationFieldUniversalIdentifier: UUID!triggerFieldUniversalIdentifiers: [UUID!]+ happensAtFieldUniversalIdentifier: UUID}type TimelineActivityTypeEmit {diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex ee355acb256..0331a71b0b9 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -2904,6 +2904,7 @@ export type MetadataTranslationProvenance = 'WORKSPACE' | 'SHIPPED' | 'INHERITEDexport interface TimelineActivityTypeEmitThrough {relationFieldUniversalIdentifier: Scalars['UUID']triggerFieldUniversalIdentifiers?: Scalars['UUID'][]+ happensAtFieldUniversalIdentifier?: Scalars['UUID']__typename: 'TimelineActivityTypeEmitThrough'}@@ -6392,6 +6393,7 @@ export interface MetadataTranslationGenqlSelection{export interface TimelineActivityTypeEmitThroughGenqlSelection{relationFieldUniversalIdentifier?: boolean | numbertriggerFieldUniversalIdentifiers?: boolean | number+ happensAtFieldUniversalIdentifier?: boolean | number__typename?: boolean | number__scalar?: boolean | number}diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex e6f6724c9e9..a3ee0a8ddcd 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -6474,6 +6474,9 @@ export default {"triggerFieldUniversalIdentifiers": [3],+ "happensAtFieldUniversalIdentifier": [+ 3+ ],"__typename": [1]diff --git a/packages/twenty-docs/developers/extend/apps/data/timeline-activity-types.mdx b/packages/twenty-docs/developers/extend/apps/data/timeline-activity-types.mdxindex 879589bfd80..0f0d69eaf30 100644--- a/packages/twenty-docs/developers/extend/apps/data/timeline-activity-types.mdx+++ b/packages/twenty-docs/developers/extend/apps/data/timeline-activity-types.mdx@@ -74,6 +74,8 @@ export default defineTimelineActivityType({An `updated` through event is emitted for every source update by default. Set `emit.through.triggerFieldUniversalIdentifiers` when only changes to selected source fields should appear on the target timelines.+A `linked` event is timestamped at the moment it is written. When the source record carries its own moment in time, set `emit.through.happensAtFieldUniversalIdentifier` to a `DATE_TIME` or `DATE` field on the source object: the timeline anchors the event at that field's value instead, and follows it when the value changes. Twenty's standard email and calendar events use this to anchor at `receivedAt` and `startsAt`.+Omit `emit` for an explicit domain event that your logic function creates itself. This avoids producing both an automatic audit row and an explicit row for the same operation.```ts filename="src/timeline-activity-types/post-card-sent.ts"@@ -178,6 +180,7 @@ mutation ResetTimelineActivityType($id: UUID!) {| `emit.objectUniversalIdentifier` | With emit | Object whose records emit this type || `emit.through.relationFieldUniversalIdentifier` | No | Direct or junction relation used to fan out to related timelines || `emit.through.triggerFieldUniversalIdentifiers` | No | Source fields that can trigger an `updated` through event |+| `emit.through.happensAtFieldUniversalIdentifier` | No | Source date field used as the event's `happensAt` timestamp for `linked` events, instead of the write time || `frontComponentUniversalIdentifier` | No | App-owned front component mounted when the row is expanded || `replacesTimelineActivityTypeUniversalIdentifier` | No | Existing emit type replaced; requires `emit` |diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex bcd2ea8346f..ef0ba24bd66 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -5714,6 +5714,7 @@ export type TimelineActivityTypeEmit = {export type TimelineActivityTypeEmitThrough = {__typename?: 'TimelineActivityTypeEmitThrough';+ happensAtFieldUniversalIdentifier?: Maybe<Scalars['UUID']['output']>;relationFieldUniversalIdentifier: Scalars['UUID']['output'];triggerFieldUniversalIdentifiers?: Maybe<Array<Scalars['UUID']['output']>>;};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471738599-add-attachment-timeline-activity-types.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471738599-add-attachment-timeline-activity-types.command.tsindex b7aff579d46..fc35ed83022 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471738599-add-attachment-timeline-activity-types.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471738599-add-attachment-timeline-activity-types.command.ts@@ -154,6 +154,7 @@ export class AddAttachmentTimelineActivityTypesCommand extends ProvisionedWorksptargetRelationFieldUniversalIdentifier:attachmentTargetRelationFieldMetadata.universalIdentifier,triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,replacesTimelineActivityTypeUniversalIdentifier: null,isActive: true,overrides: null,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787561579075-repair-attachment-timeline-activity-types.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787561579075-repair-attachment-timeline-activity-types.command.tsindex e101bbe1ae5..e661633cb77 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787561579075-repair-attachment-timeline-activity-types.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-35/2-35-workspace-command-1787561579075-repair-attachment-timeline-activity-types.command.ts@@ -156,6 +156,7 @@ export class RepairAttachmentTimelineActivityTypesCommand extends ProvisionedWortargetRelationFieldUniversalIdentifier:attachmentTargetRelationFieldMetadata.universalIdentifier,triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,replacesTimelineActivityTypeUniversalIdentifier: null,isActive: true,overrides: null,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1787918663364-add-timeline-activity-happens-at-field.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1787918663364-add-timeline-activity-happens-at-field.tsnew file mode 100644index 00000000000..cfc4d80c5b6--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1787918663364-add-timeline-activity-happens-at-field.ts@@ -0,0 +1,21 @@+import { QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.38.0', 1787918663364)+export class AddTimelineActivityHappensAtFieldFastInstanceCommand+ implements FastInstanceCommand+{+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."timelineActivityType" ADD "happensAtFieldUniversalIdentifier" uuid',+ );+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "happensAtFieldUniversalIdentifier"',+ );+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.tsindex fa660808028..b4b7cc744e9 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-upgrade-version-command.module.ts@@ -3,11 +3,14 @@ import { Module } from '@nestjs/common';import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';import { EnableEditLayoutAcrossAppCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787906715270-enable-edit-layout-across-app.command';import { BackfillLinkedTimelineActivityHappensAtCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787914663665-backfill-linked-timeline-activity-happens-at.command';+import { ConfigureTimelineActivityHappensAtCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command';+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';@Module({imports: [+ ApplicationModule,WorkspaceCacheModule,WorkspaceIteratorModule,WorkspaceMigrationModule,@@ -15,6 +18,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceproviders: [EnableEditLayoutAcrossAppCommand,BackfillLinkedTimelineActivityHappensAtCommand,+ ConfigureTimelineActivityHappensAtCommand,],})export class V2_38_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command.tsnew file mode 100644index 00000000000..33cb3e7573d--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command.ts@@ -0,0 +1,86 @@+import { Command } from 'nest-commander';+import { isDefined } from 'twenty-shared/utils';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { validateStandardMetadataUpdateCount } from 'src/database/commands/upgrade-version-command/2-34/utils/validate-standard-metadata-update-count.util';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { STANDARD_TIMELINE_ACTIVITY_HAPPENS_AT_2_38 } from 'src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-happens-at-2-38.constant';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++@RegisteredWorkspaceCommand('2.38.0', 1787918663365)+@Command({+ name: 'upgrade:2-38:configure-timeline-activity-happens-at',+ description:+ 'Point the standard messageLinked and calendarEventLinked timeline activity types at their source semantic timestamp field',+})+export class ConfigureTimelineActivityHappensAtCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly applicationService: ApplicationService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ dataSource,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ if (!isDefined(dataSource)) {+ this.logger.log(`No data source for workspace ${workspaceId}, skipping`);++ return;+ }++ if (options.dryRun) {+ this.logger.log(+ `[DRY RUN] Would configure timeline activity happensAt fields for workspace ${workspaceId}`,+ );++ return;+ }++ const { twentyStandardFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );++ const happensAtValueClauses = STANDARD_TIMELINE_ACTIVITY_HAPPENS_AT_2_38.map(+ (_, index) => `($${index * 2 + 3}::uuid, $${index * 2 + 4}::uuid)`,+ ).join(', ');+ const happensAtParameters =+ STANDARD_TIMELINE_ACTIVITY_HAPPENS_AT_2_38.flatMap((definition) => [+ definition.universalIdentifier,+ definition.happensAtFieldUniversalIdentifier,+ ]);++ const happensAtResult = await dataSource.query<[unknown[], number]>(+ `UPDATE "core"."timelineActivityType" AS timeline_activity_type+ SET "happensAtFieldUniversalIdentifier" = happens_at."happensAtFieldUniversalIdentifier"+ FROM (VALUES ${happensAtValueClauses}) AS happens_at(+ "universalIdentifier",+ "happensAtFieldUniversalIdentifier"+ )+ WHERE timeline_activity_type."workspaceId" = $1+ AND timeline_activity_type."applicationId" = $2+ AND timeline_activity_type."universalIdentifier" = happens_at."universalIdentifier"`,+ [workspaceId, twentyStandardFlatApplication.id, ...happensAtParameters],+ );++ validateStandardMetadataUpdateCount({+ actualCount: happensAtResult[1],+ expectedCount: STANDARD_TIMELINE_ACTIVITY_HAPPENS_AT_2_38.length,+ logger: this.logger,+ metadataLabel: 'standard timeline activity happensAt fields',+ workspaceId,+ });++ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [+ 'flatTimelineActivityTypeMaps',+ ]);+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command.spec.tsnew file mode 100644index 00000000000..eb6d134dac8--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/__tests__/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command.spec.ts@@ -0,0 +1,99 @@+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';++import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { ConfigureTimelineActivityHappensAtCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-workspace-command-1787918663365-configure-timeline-activity-happens-at.command';+import { type ApplicationService } from 'src/engine/core-modules/application/application.service';+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';++const WORKSPACE_ID = '00000000-0000-4000-8000-000000000001';+const STANDARD_APPLICATION_ID = '00000000-0000-4000-8000-000000000002';++const buildCommand = ({+ invalidateAndRecompute,+}: {+ invalidateAndRecompute: ReturnType<typeof jest.fn>;+}) =>+ new ConfigureTimelineActivityHappensAtCommand(+ {} as WorkspaceIteratorService,+ {+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest+ .fn()+ .mockResolvedValue({+ twentyStandardFlatApplication: { id: STANDARD_APPLICATION_ID },+ }),+ } as unknown as ApplicationService,+ { invalidateAndRecompute } as unknown as WorkspaceCacheService,+ );++describe('ConfigureTimelineActivityHappensAtCommand', () => {+ it('points the standard linked types at their semantic timestamp fields', async () => {+ const query = jest.fn().mockResolvedValueOnce([[], 2]);+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);+ const command = buildCommand({ invalidateAndRecompute });++ await command.runOnWorkspace({+ workspaceId: WORKSPACE_ID,+ dataSource: { query } as never,+ options: {},+ index: 0,+ total: 1,+ });++ expect(query).toHaveBeenCalledTimes(1);+ expect(query.mock.calls[0][0]).toContain(+ '"happensAtFieldUniversalIdentifier"',+ );+ expect(query.mock.calls[0][0]).toContain(+ 'timeline_activity_type."applicationId" = $2',+ );+ expect(query.mock.calls[0][1]).toEqual(+ expect.arrayContaining([+ WORKSPACE_ID,+ STANDARD_APPLICATION_ID,+ STANDARD_OBJECTS.message.fields.receivedAt.universalIdentifier,+ STANDARD_OBJECTS.calendarEvent.fields.startsAt.universalIdentifier,+ ]),+ );+ expect(invalidateAndRecompute).toHaveBeenCalledWith(WORKSPACE_ID, [+ 'flatTimelineActivityTypeMaps',+ ]);+ });++ it('does not block the fleet when optional standard metadata is missing', async () => {+ const query = jest.fn().mockResolvedValueOnce([[], 1]);+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);+ const command = buildCommand({ invalidateAndRecompute });++ jest.spyOn(command['logger'], 'warn').mockImplementation();++ await command.runOnWorkspace({+ workspaceId: WORKSPACE_ID,+ dataSource: { query } as never,+ options: {},+ index: 0,+ total: 1,+ });++ expect(invalidateAndRecompute).toHaveBeenCalledTimes(1);+ expect(command['logger'].warn).toHaveBeenCalled();+ });++ it('only logs on a dry run', async () => {+ const query = jest.fn();+ const invalidateAndRecompute = jest.fn();+ const command = buildCommand({ invalidateAndRecompute });++ jest.spyOn(command['logger'], 'log').mockImplementation();++ await command.runOnWorkspace({+ workspaceId: WORKSPACE_ID,+ dataSource: { query } as never,+ options: { dryRun: true },+ index: 0,+ total: 1,+ });++ expect(query).not.toHaveBeenCalled();+ expect(invalidateAndRecompute).not.toHaveBeenCalled();+ });+});diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/timeline-activity-happens-at-upgrade-command-name.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/timeline-activity-happens-at-upgrade-command-name.constant.tsnew file mode 100644index 00000000000..85dfaaf68ea--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-38/timeline-activity-happens-at-upgrade-command-name.constant.ts@@ -0,0 +1,2 @@+export const ADD_TIMELINE_ACTIVITY_HAPPENS_AT_FIELD_UPGRADE_COMMAND_NAME =+ '2.38.0_AddTimelineActivityHappensAtFieldFastInstanceCommand_1787918663364';diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex 432c673ecf7..de05d139c20 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -163,6 +163,7 @@ import { MakeUserEmailCaseInsensitiveFastInstanceCommand } from 'src/database/coimport { BackfillMissingPageLayoutWidgetPositionsSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-37/2-37-instance-command-slow-1787838153752-backfill-missing-page-layout-widget-positions';import { DropBillingCustomerCreditBalanceMicroFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1787906740818-drop-billing-customer-credit-balance-micro';import { DropHasReachedCurrentPeriodCapFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1787906740819-drop-has-reached-current-period-cap';+import { AddTimelineActivityHappensAtFieldFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-38/2-38-instance-command-fast-1787918663364-add-timeline-activity-happens-at-field';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -328,4 +329,5 @@ export const INSTANCE_COMMANDS = [BackfillMissingPageLayoutWidgetPositionsSlowInstanceCommand,DropBillingCustomerCreditBalanceMicroFastInstanceCommand,DropHasReachedCurrentPeriodCapFastInstanceCommand,+ AddTimelineActivityHappensAtFieldFastInstanceCommand,];diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.spec.tsindex b6cabdc5789..c2f7f2c78b0 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.spec.ts@@ -7,6 +7,7 @@ const RELATION_UNIVERSAL_IDENTIFIER = '44444444-4444-4444-8444-444444444444';const TRIGGER_UNIVERSAL_IDENTIFIER = '55555555-5555-4555-8555-555555555555';const REPLACED_TYPE_UNIVERSAL_IDENTIFIER ='66666666-6666-4666-8666-666666666666';+const HAPPENS_AT_UNIVERSAL_IDENTIFIER = '77777777-7777-4777-8777-777777777777';const NOW = '2026-08-22T00:00:00.000Z';describe('fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType', () => {@@ -34,6 +35,34 @@ describe('fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType',objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,targetRelationFieldUniversalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,triggerFieldUniversalIdentifiers: [TRIGGER_UNIVERSAL_IDENTIFIER],+ happensAtFieldUniversalIdentifier: null,+ });+ });++ it('maps the through happensAt field into flat metadata', () => {+ expect(+ fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType({+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,+ now: NOW,+ timelineActivityTypeManifest: {+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,+ name: 'deploymentLinked',+ label: 'linked a deployment',+ emit: {+ on: 'linked',+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ through: {+ relationFieldUniversalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,+ happensAtFieldUniversalIdentifier:+ HAPPENS_AT_UNIVERSAL_IDENTIFIER,+ },+ },+ },+ }),+ ).toMatchObject({+ action: 'linked',+ targetRelationFieldUniversalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,+ happensAtFieldUniversalIdentifier: HAPPENS_AT_UNIVERSAL_IDENTIFIER,});});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.tsindex b82e01aa5ac..270eebf5c95 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util.ts@@ -28,6 +28,9 @@ export const fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityTypetriggerFieldUniversalIdentifiers:timelineActivityTypeManifest.emit?.through?.triggerFieldUniversalIdentifiers ?? null,+ happensAtFieldUniversalIdentifier:+ timelineActivityTypeManifest.emit?.through+ ?.happensAtFieldUniversalIdentifier ?? null,replacesTimelineActivityTypeUniversalIdentifier:timelineActivityTypeManifest.replacesTimelineActivityTypeUniversalIdentifier ??null,diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snapindex 7b5b0a0eb76..b5a5e6c2521 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap@@ -344,6 +344,7 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY should ma"objectUniversalIdentifier","targetRelationFieldUniversalIdentifier","triggerFieldUniversalIdentifiers",+ "happensAtFieldUniversalIdentifier","replacesTimelineActivityTypeUniversalIdentifier","isActive","overrides",diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.tsindex 2ede3a887b4..4af5e90059c 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts@@ -1937,6 +1937,11 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {toStringify: false,universalProperty: undefined,},+ happensAtFieldUniversalIdentifier: {+ toCompare: true,+ toStringify: false,+ universalProperty: undefined,+ },replacesTimelineActivityTypeUniversalIdentifier: {toCompare: true,toStringify: false,diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-happens-at-2-38.constant.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-happens-at-2-38.constant.tsnew file mode 100644index 00000000000..cab85c14554--- /dev/null+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-happens-at-2-38.constant.ts@@ -0,0 +1,13 @@+// Runtime uses this frozen copy until every workspace has completed 2.38.+export const STANDARD_TIMELINE_ACTIVITY_HAPPENS_AT_2_38 = [+ {+ // messageLinked anchors at message.receivedAt+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0f',+ happensAtFieldUniversalIdentifier: '20202020-140a-4a2a-9f86-f13b6a979afc',+ },+ {+ // calendarEventLinked anchors at calendarEvent.startsAt+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c10',+ happensAtFieldUniversalIdentifier: '20202020-2c57-4c75-93c5-2ac950a6ed67',+ },+] as const;diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-type-definitions.constant.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-type-definitions.constant.tsindex e427ba9e0cf..aa98bb681bf 100644--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-type-definitions.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-type-definitions.constant.ts@@ -18,6 +18,7 @@ type StandardTimelineActivityTypeDefinitionSource = {through?: {relationFieldUniversalIdentifier: string;triggerFieldUniversalIdentifiers?: string[];+ happensAtFieldUniversalIdentifier?: string;};};};@@ -28,6 +29,7 @@ export type StandardTimelineActivityTypeDefinition =objectUniversalIdentifier: string | null;targetRelationFieldUniversalIdentifier?: string;triggerFieldUniversalIdentifiers?: string[];+ happensAtFieldUniversalIdentifier?: string;};// Standard wildcard emitters supply platform fallbacks when no object-specific@@ -231,6 +233,8 @@ const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITION_SOURCES: StandardTimelineActivirelationFieldUniversalIdentifier:STANDARD_OBJECTS.message.fields.messageParticipants.universalIdentifier,+ happensAtFieldUniversalIdentifier:+ STANDARD_OBJECTS.message.fields.receivedAt.universalIdentifier,},},},@@ -252,6 +256,8 @@ const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITION_SOURCES: StandardTimelineActivirelationFieldUniversalIdentifier:STANDARD_OBJECTS.calendarEvent.fields.calendarEventParticipants.universalIdentifier,+ happensAtFieldUniversalIdentifier:+ STANDARD_OBJECTS.calendarEvent.fields.startsAt.universalIdentifier,},},},@@ -306,4 +312,6 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActividefinition.emit.through?.relationFieldUniversalIdentifier,triggerFieldUniversalIdentifiers:definition.emit.through?.triggerFieldUniversalIdentifiers,+ happensAtFieldUniversalIdentifier:+ definition.emit.through?.happensAtFieldUniversalIdentifier,}));diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type-emit.dto.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type-emit.dto.tsindex 700e67f20bf..d3ec01b6194 100644--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type-emit.dto.ts+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type-emit.dto.ts@@ -15,6 +15,11 @@ export class TimelineActivityTypeEmitThroughDTO {@IsOptional()@Field(() => [UUIDScalarType], { nullable: true })triggerFieldUniversalIdentifiers: string[] | null;++ @IsOptional()+ @IsUUID()+ @Field(() => UUIDScalarType, { nullable: true })+ happensAtFieldUniversalIdentifier: string | null;}@ObjectType('TimelineActivityTypeEmit')diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/__tests__/timeline-activity-type-upgrade-shape.spec.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/__tests__/timeline-activity-type-upgrade-shape.spec.tsindex ae79371b31c..c61dae22498 100644--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/__tests__/timeline-activity-type-upgrade-shape.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/__tests__/timeline-activity-type-upgrade-shape.spec.ts@@ -5,6 +5,7 @@ import {TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME,} from 'src/database/commands/upgrade-version-command/2-34/timeline-activity-type-upgrade-command-name.constants';import { DROP_TIMELINE_ACTIVITY_TYPE_RENDERER_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-35/drop-timeline-activity-type-renderer-upgrade-command-name.constant';+import { ADD_TIMELINE_ACTIVITY_HAPPENS_AT_FIELD_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-38/timeline-activity-happens-at-upgrade-command-name.constant';import { resolveEntityShapeAtUpgradeCursor } from 'src/engine/core-modules/upgrade/utils/resolve-entity-shape-at-upgrade-cursor.util';import { TimelineActivityTypeEntity } from 'src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity';@@ -13,6 +14,7 @@ const CURRENT_COLUMNS = ['frontComponentUniversalIdentifier','targetRelationFieldUniversalIdentifier','triggerFieldUniversalIdentifiers',+ 'happensAtFieldUniversalIdentifier','replacesTimelineActivityTypeUniversalIdentifier','overrides','isActive',@@ -46,6 +48,7 @@ describe('TimelineActivityTypeEntity upgrade shape', () => {new Set(['targetRelationFieldUniversalIdentifier','triggerFieldUniversalIdentifiers',+ 'happensAtFieldUniversalIdentifier','replacesTimelineActivityTypeUniversalIdentifier','overrides','isActive',@@ -59,6 +62,7 @@ describe('TimelineActivityTypeEntity upgrade shape', () => {]).hiddenPropertyNames,).toEqual(new Set([+ 'happensAtFieldUniversalIdentifier','replacesTimelineActivityTypeUniversalIdentifier','overrides','isActive',@@ -71,7 +75,9 @@ describe('TimelineActivityTypeEntity upgrade shape', () => {ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME,ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,]).hiddenPropertyNames,- ).toEqual(new Set(['overrides', 'isActive']));+ ).toEqual(+ new Set(['happensAtFieldUniversalIdentifier', 'overrides', 'isActive']),+ );expect(resolveAt([@@ -80,7 +86,17 @@ describe('TimelineActivityTypeEntity upgrade shape', () => {ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME,]).hiddenPropertyNames,- ).toEqual(new Set());+ ).toEqual(new Set(['happensAtFieldUniversalIdentifier']));++ expect(+ resolveAt([+ REFACTOR_TIMELINE_ACTIVITY_TYPE_RENDERING_UPGRADE_COMMAND_NAME,+ ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME,+ ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,+ TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME,+ DROP_TIMELINE_ACTIVITY_TYPE_RENDERER_UPGRADE_COMMAND_NAME,+ ]).hiddenPropertyNames,+ ).toEqual(new Set(['renderer', 'happensAtFieldUniversalIdentifier']));expect(resolveAt([@@ -89,6 +105,7 @@ describe('TimelineActivityTypeEntity upgrade shape', () => {ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME,DROP_TIMELINE_ACTIVITY_TYPE_RENDERER_UPGRADE_COMMAND_NAME,+ ADD_TIMELINE_ACTIVITY_HAPPENS_AT_FIELD_UPGRADE_COMMAND_NAME,]).hiddenPropertyNames,).toEqual(new Set(['renderer']));});diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.tsindex 62dc93c33d5..40d3a9c7463 100644--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity.ts@@ -17,6 +17,7 @@ import {TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME,} from 'src/database/commands/upgrade-version-command/2-34/timeline-activity-type-upgrade-command-name.constants';import { DROP_TIMELINE_ACTIVITY_TYPE_RENDERER_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-35/drop-timeline-activity-type-renderer-upgrade-command-name.constant';+import { ADD_TIMELINE_ACTIVITY_HAPPENS_AT_FIELD_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-38/timeline-activity-happens-at-upgrade-command-name.constant';import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';import { WasRemovedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-removed-in-upgrade.decorator';@@ -97,6 +98,16 @@ export class TimelineActivityTypeEntity@Column({ nullable: true, type: 'uuid', array: true })triggerFieldUniversalIdentifiers: string[] | null;+ // The source object field carrying the moment linked activities anchor at+ // (an email's receivedAt, a calendar event's startsAt). Null keeps the+ // event write time.+ @WasIntroducedInUpgrade({+ upgradeCommandName:+ ADD_TIMELINE_ACTIVITY_HAPPENS_AT_FIELD_UPGRADE_COMMAND_NAME,+ })+ @Column({ nullable: true, type: 'uuid' })+ happensAtFieldUniversalIdentifier: string | null;+@WasIntroducedInUpgrade({upgradeCommandName:ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.tsindex 5aedeb41f18..143dda352fb 100644--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.spec.ts@@ -22,6 +22,7 @@ const timelineActivityType: FlatTimelineActivityType = {objectUniversalIdentifier: null,targetRelationFieldUniversalIdentifier: null,triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,replacesTimelineActivityTypeUniversalIdentifier: null,isActive: true,overrides: null,diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.tsindex 688a2c17e89..032fc5e834d 100644--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util.ts@@ -24,6 +24,8 @@ export const fromFlatTimelineActivityTypeToTimelineActivityTypeDto = (flatTimelineActivityType.targetRelationFieldUniversalIdentifier,triggerFieldUniversalIdentifiers:flatTimelineActivityType.triggerFieldUniversalIdentifiers,+ happensAtFieldUniversalIdentifier:+ flatTimelineActivityType.happensAtFieldUniversalIdentifier,}: null,}diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/__tests__/build-standard-flat-timeline-activity-type-maps.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/__tests__/build-standard-flat-timeline-activity-type-maps.util.spec.tsindex e2b13863a91..d33b6f4e6fe 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/__tests__/build-standard-flat-timeline-activity-type-maps.util.spec.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/__tests__/build-standard-flat-timeline-activity-type-maps.util.spec.ts@@ -37,6 +37,7 @@ describe('buildStandardFlatTimelineActivityTypeMaps', () => {new Set(['targetRelationFieldUniversalIdentifier','triggerFieldUniversalIdentifiers',+ 'happensAtFieldUniversalIdentifier',]),);@@ -48,6 +49,10 @@ describe('buildStandardFlatTimelineActivityTypeMaps', () => {getTimelineActivityTypeOrThrow(maps, 'noteUpdated').triggerFieldUniversalIdentifiers,).toBeNull();+ expect(+ getTimelineActivityTypeOrThrow(maps, 'messageLinked')+ .happensAtFieldUniversalIdentifier,+ ).toBeNull();});it('should include routing properties after their upgrade command is applied', () => {@@ -71,5 +76,17 @@ describe('buildStandardFlatTimelineActivityTypeMaps', () => {getTimelineActivityTypeOrThrow(maps, 'attachmentLinked').targetRelationFieldUniversalIdentifier,).toBe(STANDARD_OBJECTS.attachment.fields.targetPerson.universalIdentifier);+ expect(+ getTimelineActivityTypeOrThrow(maps, 'messageLinked')+ .happensAtFieldUniversalIdentifier,+ ).toBe(STANDARD_OBJECTS.message.fields.receivedAt.universalIdentifier);+ expect(+ getTimelineActivityTypeOrThrow(maps, 'calendarEventLinked')+ .happensAtFieldUniversalIdentifier,+ ).toBe(STANDARD_OBJECTS.calendarEvent.fields.startsAt.universalIdentifier);+ expect(+ getTimelineActivityTypeOrThrow(maps, 'attachmentLinked')+ .happensAtFieldUniversalIdentifier,+ ).toBeNull();});});diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/build-standard-flat-timeline-activity-type-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/build-standard-flat-timeline-activity-type-maps.util.tsindex ee6846f66e4..503c3f4ae2a 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/build-standard-flat-timeline-activity-type-maps.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/build-standard-flat-timeline-activity-type-maps.util.ts@@ -54,6 +54,13 @@ export const buildStandardFlatTimelineActivityTypeMaps = ({? null: (definition.emit.through?.triggerFieldUniversalIdentifiers ??null),+ happensAtFieldUniversalIdentifier:+ hiddenTimelineActivityTypeColumnPropertyNames.has(+ 'happensAtFieldUniversalIdentifier',+ )+ ? null+ : (definition.emit.through?.happensAtFieldUniversalIdentifier ??+ null),replacesTimelineActivityTypeUniversalIdentifier: null,isActive: true,overrides: null,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-timeline-activity-type-validator.service.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-timeline-activity-type-validator.service.spec.tsindex a33eef39797..f6acf643799 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-timeline-activity-type-validator.service.spec.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-timeline-activity-type-validator.service.spec.ts@@ -8,6 +8,7 @@ const APPLICATION_UNIVERSAL_IDENTIFIER = '11111111-1111-4111-8111-111111111111';const TYPE_UNIVERSAL_IDENTIFIER = '22222222-2222-4222-8222-222222222222';const OBJECT_UNIVERSAL_IDENTIFIER = '33333333-3333-4333-8333-333333333333';const RELATION_UNIVERSAL_IDENTIFIER = '44444444-4444-4444-8444-444444444444';+const HAPPENS_AT_UNIVERSAL_IDENTIFIER = '55555555-5555-4555-8555-555555555555';const emptyMaps = () => ({ byUniversalIdentifier: {} });@@ -18,6 +19,7 @@ const buildCreationArgs = (objectUniversalIdentifier: string | null;frontComponentUniversalIdentifier: string | null;targetRelationFieldUniversalIdentifier: string | null;+ happensAtFieldUniversalIdentifier: string | null;}> = {},) =>({@@ -32,6 +34,7 @@ const buildCreationArgs = (objectUniversalIdentifier: null,targetRelationFieldUniversalIdentifier: null,triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,replacesTimelineActivityTypeUniversalIdentifier: null,isActive: true,overrides: null,@@ -134,6 +137,111 @@ describe('FlatTimelineActivityTypeValidatorService', () => {expect(result.errors).toEqual([]);});+ it('accepts a date field on the source object as happensAt field', () => {+ const creationArgs = buildCreationArgs(APPLICATION_UNIVERSAL_IDENTIFIER, {+ action: 'linked',+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ targetRelationFieldUniversalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,+ happensAtFieldUniversalIdentifier: HAPPENS_AT_UNIVERSAL_IDENTIFIER,+ });+ const validationMaps =+ creationArgs.optimisticFlatEntityMapsAndRelatedFlatEntityMaps;++ validationMaps.flatObjectMetadataMaps.byUniversalIdentifier[+ OBJECT_UNIVERSAL_IDENTIFIER+ ] = {+ universalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,+ } as never;+ validationMaps.flatFieldMetadataMaps.byUniversalIdentifier[+ RELATION_UNIVERSAL_IDENTIFIER+ ] = {+ universalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,+ objectMetadataUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ type: FieldMetadataType.MORPH_RELATION,+ universalSettings: { relationType: RelationType.MANY_TO_ONE },+ } as never;+ validationMaps.flatFieldMetadataMaps.byUniversalIdentifier[+ HAPPENS_AT_UNIVERSAL_IDENTIFIER+ ] = {+ universalIdentifier: HAPPENS_AT_UNIVERSAL_IDENTIFIER,+ objectMetadataUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ type: FieldMetadataType.DATE_TIME,+ } as never;++ const result =+ service.validateFlatTimelineActivityTypeCreation(creationArgs);++ expect(result.errors).toEqual([]);+ });++ it('rejects a happensAt field that is not a date field on the source object', () => {+ const creationArgs = buildCreationArgs(APPLICATION_UNIVERSAL_IDENTIFIER, {+ action: 'linked',+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ targetRelationFieldUniversalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,+ happensAtFieldUniversalIdentifier: HAPPENS_AT_UNIVERSAL_IDENTIFIER,+ });+ const validationMaps =+ creationArgs.optimisticFlatEntityMapsAndRelatedFlatEntityMaps;++ validationMaps.flatObjectMetadataMaps.byUniversalIdentifier[+ OBJECT_UNIVERSAL_IDENTIFIER+ ] = {+ universalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,+ } as never;+ validationMaps.flatFieldMetadataMaps.byUniversalIdentifier[+ RELATION_UNIVERSAL_IDENTIFIER+ ] = {+ universalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,+ objectMetadataUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ type: FieldMetadataType.MORPH_RELATION,+ universalSettings: { relationType: RelationType.MANY_TO_ONE },+ } as never;+ validationMaps.flatFieldMetadataMaps.byUniversalIdentifier[+ HAPPENS_AT_UNIVERSAL_IDENTIFIER+ ] = {+ universalIdentifier: HAPPENS_AT_UNIVERSAL_IDENTIFIER,+ objectMetadataUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,+ type: FieldMetadataType.TEXT,+ } as never;++ const result =+ service.validateFlatTimelineActivityTypeCreation(creationArgs);++ expect(result.errors).toEqual(+ expect.arrayContaining([+ expect.objectContaining({+ message:+ 'Timeline activity type happensAt field must be a date field on the source object of a linked relation event',+ }),+ ]),+ );+ });++ it('rejects a happensAt field on an emitter without a linked action', () => {+ const creationArgs = buildCreationArgs(+ TWENTY_STANDARD_APPLICATION.universalIdentifier,+ {+ action: 'created',+ happensAtFieldUniversalIdentifier: HAPPENS_AT_UNIVERSAL_IDENTIFIER,+ },+ );++ const result =+ service.validateFlatTimelineActivityTypeCreation(creationArgs);++ expect(result.errors).toEqual(+ expect.arrayContaining([+ expect.objectContaining({+ message:+ 'Timeline activity type happensAt field must be a date field on the source object of a linked relation event',+ }),+ ]),+ );+ });+it('does not expose standard renderers to installed applications', () => {const creationArgs = buildCreationArgs(APPLICATION_UNIVERSAL_IDENTIFIER, {objectUniversalIdentifier: '33333333-3333-4333-8333-333333333333',diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-timeline-activity-type-validator.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-timeline-activity-type-validator.service.tsindex c5599054959..69e2707c5b3 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-timeline-activity-type-validator.service.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-timeline-activity-type-validator.service.ts@@ -7,7 +7,7 @@ import {isStandardTimelineActivityRendererUniversalIdentifier,isTimelineActivityAction,} from 'twenty-shared/timeline';-import { RelationType } from 'twenty-shared/types';+import { FieldMetadataType, RelationType } from 'twenty-shared/types';import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { type MetadataUniversalFlatEntityAndRelatedFlatEntityMapsForValidation } from 'src/engine/metadata-modules/flat-entity/types/metadata-flat-entity-and-related-flat-entity-maps-for-validation.type';@@ -217,6 +217,7 @@ export class FlatTimelineActivityTypeValidatorService {frontComponentUniversalIdentifier,targetRelationFieldUniversalIdentifier,triggerFieldUniversalIdentifiers,+ happensAtFieldUniversalIdentifier,replacesTimelineActivityTypeUniversalIdentifier,} = timelineActivityType;@@ -363,6 +364,29 @@ export class FlatTimelineActivityTypeValidatorService {}}+ if (isDefined(happensAtFieldUniversalIdentifier)) {+ const happensAtField =+ validationMaps.flatFieldMetadataMaps.byUniversalIdentifier[+ happensAtFieldUniversalIdentifier+ ];+ const hasInvalidHappensAtField =+ timelineActivityType.action !== 'linked' ||+ !isDefined(targetRelationFieldUniversalIdentifier) ||+ !isDefined(happensAtField) ||+ happensAtField.objectMetadataUniversalIdentifier !==+ objectUniversalIdentifier ||+ (happensAtField.type !== FieldMetadataType.DATE_TIME &&+ happensAtField.type !== FieldMetadataType.DATE);++ if (hasInvalidHappensAtField) {+ validationResult.errors.push({+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,+ message: t`Timeline activity type happensAt field must be a date field on the source object of a linked relation event`,+ userFriendlyMessage: msg`The happensAt field used by this timeline activity type is not available`,+ });+ }+ }+if (!isDefined(frontComponentUniversalIdentifier)) {return;}diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.tsindex 3cda5e7f2b4..9913da29489 100644--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-routing-plan.service.ts@@ -193,6 +193,15 @@ export class TimelineActivityRoutingPlanService {return undefined;}+ const happensAtFlatFieldMetadata = isDefined(+ routing.happensAtFieldUniversalIdentifier,+ )+ ? findFlatEntityByUniversalIdentifier({+ flatEntityMaps: flatFieldMetadataMaps,+ universalIdentifier: routing.happensAtFieldUniversalIdentifier,+ })+ : undefined;+return {sourceFlatObjectMetadata,actions: [timelineActivityType.action],@@ -208,6 +217,14 @@ export class TimelineActivityRoutingPlanService {})?.name,).filter(isDefined) ?? null,+ // A field from another object would make the write path read a value+ // that is not the source record's own moment, so it is dropped here.+ happensAtFieldName:+ isDefined(happensAtFlatFieldMetadata) &&+ happensAtFlatFieldMetadata.objectMetadataId ===+ sourceFlatObjectMetadata.id+ ? happensAtFlatFieldMetadata.name+ : null,targetShape,};})diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.tsindex 572c30ec39a..7235c81bd1c 100644--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts@@ -180,7 +180,6 @@ export class TimelineActivityService {updates: buildLinkedTimelineActivityHappensAtSyncUpdates({rules: sourceRules,events: eventsWithoutPositionDiff,- flatFieldMetadataMaps,resolveTimelineActivityType,}),},@@ -338,9 +337,8 @@ export class TimelineActivityService {happensAt: resolveLinkedTimelineActivityHappensAt({event,ruleAction,- sourceFlatObjectMetadata: rule.sourceFlatObjectMetadata,+ happensAtFieldName: rule.happensAtFieldName,sourceRecord: record,- flatFieldMetadataMaps,}),properties: event.properties,}),@@ -372,9 +370,8 @@ export class TimelineActivityService {happensAt: resolveLinkedTimelineActivityHappensAt({event,ruleAction,- sourceFlatObjectMetadata: rule.sourceFlatObjectMetadata,+ happensAtFieldName: rule.happensAtFieldName,sourceRecord: event.properties.after as ObjectRecord | undefined,- flatFieldMetadataMaps,}),properties: event.properties,}),@@ -484,9 +481,8 @@ export class TimelineActivityService {happensAt: resolveLinkedTimelineActivityHappensAt({event,ruleAction,- sourceFlatObjectMetadata: rule.sourceFlatObjectMetadata,+ happensAtFieldName: rule.happensAtFieldName,sourceRecord,- flatFieldMetadataMaps,}),properties: {},});diff --git a/packages/twenty-server/src/modules/timeline/types/timeline-activity-rule.type.ts b/packages/twenty-server/src/modules/timeline/types/timeline-activity-rule.type.tsindex 8a375672db6..cf6ef96a2b8 100644--- a/packages/twenty-server/src/modules/timeline/types/timeline-activity-rule.type.ts+++ b/packages/twenty-server/src/modules/timeline/types/timeline-activity-rule.type.ts@@ -8,5 +8,6 @@ export type TimelineActivityRule = {actions: TimelineActivityRuleAction[];timelineActivityType?: ResolvedTimelineActivityType;triggerFieldNames: string[] | null;+ happensAtFieldName: string | null;targetShape: TimelineActivityRuleTargetShape;};diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/build-linked-timeline-activity-happens-at-sync-updates.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/build-linked-timeline-activity-happens-at-sync-updates.util.spec.tsindex 75c183079cc..6502012fce7 100644--- a/packages/twenty-server/src/modules/timeline/utils/__tests__/build-linked-timeline-activity-happens-at-sync-updates.util.spec.ts+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/build-linked-timeline-activity-happens-at-sync-updates.util.spec.ts@@ -1,26 +1,12 @@import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';import { STANDARD_OBJECTS } from 'twenty-shared/metadata';-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';import { buildLinkedTimelineActivityHappensAtSyncUpdates } from 'src/modules/timeline/utils/build-linked-timeline-activity-happens-at-sync-updates.util';const CALENDAR_EVENT_ID = 'calendar-event-id';const LINKED_TYPE_ID = 'calendar-event-linked-type-id';-const flatFieldMetadataMaps = {- byUniversalIdentifier: {- [STANDARD_OBJECTS.calendarEvent.fields.startsAt.universalIdentifier]: {- universalIdentifier:- STANDARD_OBJECTS.calendarEvent.fields.startsAt.universalIdentifier,- name: 'startsAt',- },- },- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},-} as unknown as FlatEntityMaps<FlatFieldMetadata>;-const buildCalendarEventRule = (overrides: Partial<TimelineActivityRule> = {},): TimelineActivityRule =>@@ -36,6 +22,7 @@ const buildCalendarEventRule = (snapshot: {},},triggerFieldNames: null,+ happensAtFieldName: 'startsAt',targetShape: { kind: 'JUNCTION' },...overrides,}) as TimelineActivityRule;@@ -66,7 +53,6 @@ describe('buildLinkedTimelineActivityHappensAtSyncUpdates', () => {buildStartsAtUpdatedEvent(),buildStartsAtUpdatedEvent('other-calendar-event-id'),],- flatFieldMetadataMaps,resolveTimelineActivityType: resolveTimelineActivityTypeToNothing,}),).toEqual([@@ -91,25 +77,16 @@ describe('buildLinkedTimelineActivityHappensAtSyncUpdates', () => {buildLinkedTimelineActivityHappensAtSyncUpdates({rules: [buildCalendarEventRule()],events: [titleOnlyEvent],- flatFieldMetadataMaps,resolveTimelineActivityType: resolveTimelineActivityTypeToNothing,}),).toEqual([]);});- it('ignores source objects without a semantic timestamp', () => {+ it('ignores rules without a semantic timestamp field', () => {expect(buildLinkedTimelineActivityHappensAtSyncUpdates({- rules: [- buildCalendarEventRule({- sourceFlatObjectMetadata: {- universalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,- nameSingular: 'note',- } as TimelineActivityRule['sourceFlatObjectMetadata'],- }),- ],+ rules: [buildCalendarEventRule({ happensAtFieldName: null })],events: [buildStartsAtUpdatedEvent()],- flatFieldMetadataMaps,resolveTimelineActivityType: resolveTimelineActivityTypeToNothing,}),).toEqual([]);@@ -127,7 +104,6 @@ describe('buildLinkedTimelineActivityHappensAtSyncUpdates', () => {buildCalendarEventRule({ actions: ['unlinked'] }),],events: [buildStartsAtUpdatedEvent()],- flatFieldMetadataMaps,resolveTimelineActivityType: resolveTimelineActivityTypeToNothing,}),).toEqual([]);@@ -138,7 +114,6 @@ describe('buildLinkedTimelineActivityHappensAtSyncUpdates', () => {buildLinkedTimelineActivityHappensAtSyncUpdates({rules: [buildCalendarEventRule({ timelineActivityType: undefined })],events: [buildStartsAtUpdatedEvent()],- flatFieldMetadataMaps,resolveTimelineActivityType: () => ({id: 'resolved-type-id',applicationId: 'application-id',diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-happens-at.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-happens-at.util.spec.tsindex ba2e603179c..1eb81115fd3 100644--- a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-happens-at.util.spec.ts+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-happens-at.util.spec.ts@@ -1,8 +1,5 @@import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import {resolveLinkedTimelineActivityHappensAt,resolveTimelineActivityHappensAt,@@ -44,58 +41,24 @@ describe('resolveLinkedTimelineActivityHappensAt', () => {properties: { after: { updatedAt: EVENT_TIME.toISOString() } },} as ObjectRecordBaseEvent;- const buildFlatFieldMetadataMaps = (- fields: { universalIdentifier: string; name: string }[],- ): FlatEntityMaps<FlatFieldMetadata> =>- ({- byUniversalIdentifier: Object.fromEntries(- fields.map((field) => [field.universalIdentifier, field]),- ),- universalIdentifierById: {},- universalIdentifiersByApplicationId: {},- }) as unknown as FlatEntityMaps<FlatFieldMetadata>;-- const messageFlatObjectMetadata = {- universalIdentifier: STANDARD_OBJECTS.message.universalIdentifier,- };-- const calendarEventFlatObjectMetadata = {- universalIdentifier: STANDARD_OBJECTS.calendarEvent.universalIdentifier,- };-- const flatFieldMetadataMaps = buildFlatFieldMetadataMaps([- {- universalIdentifier:- STANDARD_OBJECTS.message.fields.receivedAt.universalIdentifier,- name: 'receivedAt',- },- {- universalIdentifier:- STANDARD_OBJECTS.calendarEvent.fields.startsAt.universalIdentifier,- name: 'startsAt',- },- ]);-- it('anchors a linked message at its receivedAt instead of the sync time', () => {+ it('anchors a linked activity at the source record semantic timestamp', () => {expect(resolveLinkedTimelineActivityHappensAt({event,ruleAction: 'linked',- sourceFlatObjectMetadata: messageFlatObjectMetadata,+ happensAtFieldName: 'receivedAt',sourceRecord: { receivedAt: SOURCE_TIME.toISOString() },- flatFieldMetadataMaps,}),).toEqual(SOURCE_TIME);});- it('anchors a linked calendar event at its startsAt instead of the sync time', () => {+ it('parses a semantic timestamp carried as a Date instance', () => {expect(resolveLinkedTimelineActivityHappensAt({event,ruleAction: 'linked',- sourceFlatObjectMetadata: calendarEventFlatObjectMetadata,- sourceRecord: { startsAt: SOURCE_TIME.toISOString() },- flatFieldMetadataMaps,+ happensAtFieldName: 'startsAt',+ sourceRecord: { startsAt: SOURCE_TIME },}),).toEqual(SOURCE_TIME);});@@ -105,23 +68,19 @@ describe('resolveLinkedTimelineActivityHappensAt', () => {resolveLinkedTimelineActivityHappensAt({event,ruleAction: 'unlinked',- sourceFlatObjectMetadata: messageFlatObjectMetadata,+ happensAtFieldName: 'receivedAt',sourceRecord: { receivedAt: SOURCE_TIME.toISOString() },- flatFieldMetadataMaps,}),).toEqual(EVENT_TIME);});- it('keeps the event timestamp for objects without a semantic timestamp', () => {+ it('keeps the event timestamp when the rule declares no semantic field', () => {expect(resolveLinkedTimelineActivityHappensAt({event,ruleAction: 'linked',- sourceFlatObjectMetadata: {- universalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,- },+ happensAtFieldName: null,sourceRecord: { receivedAt: SOURCE_TIME.toISOString() },- flatFieldMetadataMaps,}),).toEqual(EVENT_TIME);});@@ -131,9 +90,8 @@ describe('resolveLinkedTimelineActivityHappensAt', () => {resolveLinkedTimelineActivityHappensAt({event,ruleAction: 'linked',- sourceFlatObjectMetadata: messageFlatObjectMetadata,+ happensAtFieldName: 'receivedAt',sourceRecord: undefined,- flatFieldMetadataMaps,}),).toEqual(EVENT_TIME);});@@ -143,9 +101,8 @@ describe('resolveLinkedTimelineActivityHappensAt', () => {resolveLinkedTimelineActivityHappensAt({event,ruleAction: 'linked',- sourceFlatObjectMetadata: messageFlatObjectMetadata,+ happensAtFieldName: 'receivedAt',sourceRecord: { receivedAt: null },- flatFieldMetadataMaps,}),).toEqual(EVENT_TIME);});diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type-routing.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type-routing.util.spec.tsindex c31db118e2a..d73b670e80a 100644--- a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type-routing.util.spec.ts+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type-routing.util.spec.ts@@ -1,4 +1,5 @@import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';import { STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS } from 'src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-type-definitions.constant';import { resolveTimelineActivityTypeRouting } from 'src/modules/timeline/utils/resolve-timeline-activity-type-routing.util';@@ -7,9 +8,13 @@ import { type ResolvableTimelineActivityType } from 'src/modules/timeline/utils/const noteUpdatedDefinition = STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS.find(({ name }) => name === 'noteUpdated',);+const messageLinkedDefinition =+ STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS.find(+ ({ name }) => name === 'messageLinked',+ );-if (!noteUpdatedDefinition) {- throw new Error('Missing noteUpdated standard timeline activity type');+if (!noteUpdatedDefinition || !messageLinkedDefinition) {+ throw new Error('Missing standard timeline activity type definitions');}const timelineActivityType = {@@ -18,6 +23,7 @@ const timelineActivityType = {TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,targetRelationFieldUniversalIdentifier: null,triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,} as ResolvableTimelineActivityType;describe('resolveTimelineActivityTypeRouting', () => {@@ -27,6 +33,7 @@ describe('resolveTimelineActivityTypeRouting', () => {noteUpdatedDefinition.targetRelationFieldUniversalIdentifier,triggerFieldUniversalIdentifiers:noteUpdatedDefinition.triggerFieldUniversalIdentifiers,+ happensAtFieldUniversalIdentifier: null,});});@@ -55,6 +62,59 @@ describe('resolveTimelineActivityTypeRouting', () => {triggerFieldUniversalIdentifiers: ['00000000-0000-4000-8000-000000000003',],+ happensAtFieldUniversalIdentifier: null,+ });+ });++ it('uses the frozen standard happensAt field while a workspace is still upgrading', () => {+ expect(+ resolveTimelineActivityTypeRouting({+ ...timelineActivityType,+ universalIdentifier: messageLinkedDefinition.universalIdentifier,+ }),+ ).toEqual({+ targetRelationFieldUniversalIdentifier:+ messageLinkedDefinition.targetRelationFieldUniversalIdentifier,+ triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier:+ STANDARD_OBJECTS.message.fields.receivedAt.universalIdentifier,+ });+ });++ it('prefers the synced happensAt field once the workspace command has run', () => {+ expect(+ resolveTimelineActivityTypeRouting({+ ...timelineActivityType,+ universalIdentifier: messageLinkedDefinition.universalIdentifier,+ targetRelationFieldUniversalIdentifier:+ messageLinkedDefinition.targetRelationFieldUniversalIdentifier ??+ null,+ happensAtFieldUniversalIdentifier:+ '00000000-0000-4000-8000-000000000004',+ }),+ ).toEqual({+ targetRelationFieldUniversalIdentifier:+ messageLinkedDefinition.targetRelationFieldUniversalIdentifier,+ triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: '00000000-0000-4000-8000-000000000004',+ });+ });++ it('does not grant the standard happensAt fallback to applications', () => {+ expect(+ resolveTimelineActivityTypeRouting({+ ...timelineActivityType,+ universalIdentifier: messageLinkedDefinition.universalIdentifier,+ applicationUniversalIdentifier: '00000000-0000-4000-8000-000000000001',+ targetRelationFieldUniversalIdentifier:+ messageLinkedDefinition.targetRelationFieldUniversalIdentifier ??+ null,+ }),+ ).toEqual({+ targetRelationFieldUniversalIdentifier:+ messageLinkedDefinition.targetRelationFieldUniversalIdentifier,+ triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,});});});diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.tsindex 9240f600c88..da65fe3295d 100644--- a/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts@@ -25,6 +25,7 @@ const noteLinkedTimelineActivityType = {objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,targetRelationFieldUniversalIdentifier: null,triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,frontComponentUniversalIdentifier: FRONT_COMPONENT_UNIVERSAL_IDENTIFIER,replacesTimelineActivityTypeUniversalIdentifier: null,isActive: true,@@ -45,6 +46,7 @@ const flatTimelineActivityTypeMaps: TimelineActivityTypeResolutionMaps = {objectUniversalIdentifier: null,targetRelationFieldUniversalIdentifier: null,triggerFieldUniversalIdentifiers: null,+ happensAtFieldUniversalIdentifier: null,frontComponentUniversalIdentifier: null,replacesTimelineActivityTypeUniversalIdentifier: null,isActive: true,diff --git a/packages/twenty-server/src/modules/timeline/utils/build-linked-timeline-activity-happens-at-sync-updates.util.ts b/packages/twenty-server/src/modules/timeline/utils/build-linked-timeline-activity-happens-at-sync-updates.util.tsindex c8b7a2eed98..536d7f249d6 100644--- a/packages/twenty-server/src/modules/timeline/utils/build-linked-timeline-activity-happens-at-sync-updates.util.ts+++ b/packages/twenty-server/src/modules/timeline/utils/build-linked-timeline-activity-happens-at-sync-updates.util.ts@@ -1,11 +1,8 @@import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';import { isDefined } from 'twenty-shared/utils';-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';import { doesObjectRecordEventChangeFields } from 'src/modules/timeline/utils/does-object-record-event-change-fields.util';-import { resolveLinkedTimelineActivityHappensAtFieldName } from 'src/modules/timeline/utils/resolve-timeline-activity-happens-at.util';import { resolveTimelineActivityTypeForRule } from 'src/modules/timeline/utils/resolve-timeline-activity-type-for-rule.util';import { type TimelineActivityTypeResolver } from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';@@ -24,12 +21,10 @@ export type LinkedTimelineActivityHappensAtSyncUpdate = {export const buildLinkedTimelineActivityHappensAtSyncUpdates = ({rules,events,- flatFieldMetadataMaps,resolveTimelineActivityType,}: {rules: TimelineActivityRule[];events: ObjectRecordBaseEvent[];- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;resolveTimelineActivityType: TimelineActivityTypeResolver;}): LinkedTimelineActivityHappensAtSyncUpdate[] => {const linkedRules = rules.filter(@@ -44,10 +39,7 @@ export const buildLinkedTimelineActivityHappensAtSyncUpdates = ({const updates: LinkedTimelineActivityHappensAtSyncUpdate[] = [];for (const rule of linkedRules) {- const happensAtFieldName = resolveLinkedTimelineActivityHappensAtFieldName({- sourceFlatObjectMetadata: rule.sourceFlatObjectMetadata,- flatFieldMetadataMaps,- });+ const happensAtFieldName = rule.happensAtFieldName;const timelineActivityTypeId = resolveTimelineActivityTypeForRule({rule,diff --git a/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-self-rule.util.ts b/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-self-rule.util.tsindex 33aba8f34ba..a743abbcbdb 100644--- a/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-self-rule.util.ts+++ b/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-self-rule.util.ts@@ -49,6 +49,7 @@ export const buildTimelineActivitySelfRule = ({sourceFlatObjectMetadata: flatObjectMetadata,actions,triggerFieldNames: null,+ happensAtFieldName: null,targetShape: { kind: 'SELF' },};};diff --git a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-happens-at.util.ts b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-happens-at.util.tsindex 0e28cb3a53a..7ae1cfd863d 100644--- a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-happens-at.util.ts+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-happens-at.util.ts@@ -1,12 +1,7 @@import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';-import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type TimelineActivityRuleAction } from 'src/modules/timeline/types/timeline-activity-rule-action.type';const parseTimestamp = (value: unknown): Date | undefined => {@@ -42,68 +37,29 @@ export const resolveTimelineActivityHappensAt = (return isDefined(recordTimestamp) ? recordTimestamp : new Date();};-// Synced records carry their own moment in time: an email happened when it was-// received and a calendar event when it starts, not when a sync or a late-// participant match wrote the row.-const LINKED_HAPPENS_AT_FIELD_UNIVERSAL_IDENTIFIER_BY_OBJECT_UNIVERSAL_IDENTIFIER: Partial<- Record<string, string>-> = {- [STANDARD_OBJECTS.message.universalIdentifier]:- STANDARD_OBJECTS.message.fields.receivedAt.universalIdentifier,- [STANDARD_OBJECTS.calendarEvent.universalIdentifier]:- STANDARD_OBJECTS.calendarEvent.fields.startsAt.universalIdentifier,-};--export const resolveLinkedTimelineActivityHappensAtFieldName = ({- sourceFlatObjectMetadata,- flatFieldMetadataMaps,-}: {- sourceFlatObjectMetadata: Pick<FlatObjectMetadata, 'universalIdentifier'>;- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;-}): string | undefined => {- const happensAtFieldUniversalIdentifier =- LINKED_HAPPENS_AT_FIELD_UNIVERSAL_IDENTIFIER_BY_OBJECT_UNIVERSAL_IDENTIFIER[- sourceFlatObjectMetadata.universalIdentifier- ];-- if (!isDefined(happensAtFieldUniversalIdentifier)) {- return undefined;- }-- return findFlatEntityByUniversalIdentifier({- flatEntityMaps: flatFieldMetadataMaps,- universalIdentifier: happensAtFieldUniversalIdentifier,- })?.name;-};-export const parseLinkedTimelineActivityHappensAt = (value: unknown,): Date | undefined => parseTimestamp(value);+// Synced records carry their own moment in time: an email happened when it was+// received and a calendar event when it starts, not when a sync or a late+// participant match wrote the row. The timeline activity type declares which+// source field holds that moment; the rule resolves it to a field name.export const resolveLinkedTimelineActivityHappensAt = ({event,ruleAction,- sourceFlatObjectMetadata,+ happensAtFieldName,sourceRecord,- flatFieldMetadataMaps,}: {event: ObjectRecordBaseEvent;ruleAction: TimelineActivityRuleAction;- sourceFlatObjectMetadata: Pick<FlatObjectMetadata, 'universalIdentifier'>;+ happensAtFieldName: string | null;sourceRecord: Record<string, unknown> | undefined;- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;}): Date => {- const happensAtFieldName =- ruleAction === 'linked'- ? resolveLinkedTimelineActivityHappensAtFieldName({- sourceFlatObjectMetadata,- flatFieldMetadataMaps,- })+ const sourceRecordHappensAt =+ ruleAction === 'linked' && isDefined(happensAtFieldName)+ ? parseTimestamp(sourceRecord?.[happensAtFieldName]): undefined;- const sourceRecordHappensAt = isDefined(happensAtFieldName)- ? parseTimestamp(sourceRecord?.[happensAtFieldName])- : undefined;-return sourceRecordHappensAt ?? resolveTimelineActivityHappensAt(event);};diff --git a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type-routing.util.ts b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type-routing.util.tsindex abcbf839e10..7d83528d900 100644--- a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type-routing.util.ts+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type-routing.util.ts@@ -1,16 +1,18 @@import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';import { isDefined } from 'twenty-shared/utils';+import { STANDARD_TIMELINE_ACTIVITY_HAPPENS_AT_2_38 } from 'src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-happens-at-2-38.constant';import { STANDARD_TIMELINE_ACTIVITY_ROUTINGS_2_34 } from 'src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-routing-2-34.constant';type TimelineActivityTypeRouting = {targetRelationFieldUniversalIdentifier: string;triggerFieldUniversalIdentifiers: string[] | null;+ happensAtFieldUniversalIdentifier: string | null;};const STANDARD_ROUTING_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER = new Map<string,- TimelineActivityTypeRouting+ Omit<TimelineActivityTypeRouting, 'happensAtFieldUniversalIdentifier'>>(STANDARD_TIMELINE_ACTIVITY_ROUTINGS_2_34.map((routing) =>@@ -29,18 +31,60 @@ const STANDARD_ROUTING_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER = new Map<),);-export const resolveTimelineActivityTypeRouting = (timelineActivityType: {+const STANDARD_HAPPENS_AT_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER =+ new Map<string, string>(+ STANDARD_TIMELINE_ACTIVITY_HAPPENS_AT_2_38.map(+ (happensAt) =>+ [+ happensAt.universalIdentifier,+ happensAt.happensAtFieldUniversalIdentifier,+ ] as const,+ ),+ );++type ResolvableTimelineActivityTypeRoutingInput = {applicationUniversalIdentifier: string;universalIdentifier: string;targetRelationFieldUniversalIdentifier: string | null;triggerFieldUniversalIdentifiers: string[] | null;-}): TimelineActivityTypeRouting | undefined => {+ happensAtFieldUniversalIdentifier: string | null;+};++const resolveHappensAtFieldUniversalIdentifier = (+ timelineActivityType: ResolvableTimelineActivityTypeRoutingInput,+): string | null => {+ if (isDefined(timelineActivityType.happensAtFieldUniversalIdentifier)) {+ return timelineActivityType.happensAtFieldUniversalIdentifier;+ }++ // Standard rows can be served before their 2.38 workspace command runs.+ if (+ timelineActivityType.applicationUniversalIdentifier !==+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER+ ) {+ return null;+ }++ return (+ STANDARD_HAPPENS_AT_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER.get(+ timelineActivityType.universalIdentifier,+ ) ?? null+ );+};++export const resolveTimelineActivityTypeRouting = (+ timelineActivityType: ResolvableTimelineActivityTypeRoutingInput,+): TimelineActivityTypeRouting | undefined => {+ const happensAtFieldUniversalIdentifier =+ resolveHappensAtFieldUniversalIdentifier(timelineActivityType);+if (isDefined(timelineActivityType.targetRelationFieldUniversalIdentifier)) {return {targetRelationFieldUniversalIdentifier:timelineActivityType.targetRelationFieldUniversalIdentifier,triggerFieldUniversalIdentifiers:timelineActivityType.triggerFieldUniversalIdentifiers,+ happensAtFieldUniversalIdentifier,};}@@ -52,7 +96,12 @@ export const resolveTimelineActivityTypeRouting = (timelineActivityType: {return undefined;}- return STANDARD_ROUTING_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER.get(- timelineActivityType.universalIdentifier,- );+ const standardRouting =+ STANDARD_ROUTING_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER.get(+ timelineActivityType.universalIdentifier,+ );++ return isDefined(standardRouting)+ ? { ...standardRouting, happensAtFieldUniversalIdentifier }+ : undefined;};diff --git a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.tsindex af069dc3e0b..52099fa94c3 100644--- a/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts@@ -23,6 +23,7 @@ export type ResolvableTimelineActivityType = Pick<| 'objectUniversalIdentifier'| 'targetRelationFieldUniversalIdentifier'| 'triggerFieldUniversalIdentifiers'+ | 'happensAtFieldUniversalIdentifier'| 'frontComponentUniversalIdentifier'| 'replacesTimelineActivityTypeUniversalIdentifier'| 'isActive'diff --git a/packages/twenty-shared/src/application/timelineActivityTypeManifestType.ts b/packages/twenty-shared/src/application/timelineActivityTypeManifestType.tsindex ae9d2144ea0..774d5c8a3a4 100644--- a/packages/twenty-shared/src/application/timelineActivityTypeManifestType.ts+++ b/packages/twenty-shared/src/application/timelineActivityTypeManifestType.ts@@ -5,6 +5,7 @@ import { type SyncableEntityOptions } from './syncableEntityOptionsType';export type TimelineActivityTypeEmitThroughManifest = {relationFieldUniversalIdentifier: string;triggerFieldUniversalIdentifiers?: string[];+ happensAtFieldUniversalIdentifier?: string;};export type TimelineActivityTypeEmitManifest = {