Skip to content

The open alternative to Salesforce, designed for AI.

Make timeline activity types a generic application contract (#24620)

Félix Malfait2f27360df3e5
diff --git a/packages/twenty-apps/examples/hello-world/yarn.lock b/packages/twenty-apps/examples/hello-world/yarn.lock
index 148d2774302..fd88434ebc7 100644
--- a/packages/twenty-apps/examples/hello-world/yarn.lock
+++ b/packages/twenty-apps/examples/hello-world/yarn.lock
@@ -1019,11 +1019,11 @@ __metadata:
linkType: hard
"brace-expansion@npm:^5.0.2":
- version: 5.0.9
- resolution: "brace-expansion@npm:5.0.9"
+ version: 5.0.8
+ resolution: "brace-expansion@npm:5.0.8"
dependencies:
balanced-match: "npm:^4.0.2"
- checksum: 10c0/3dea38884a1c3c8b1c9c44a7402a0c76fca460f70cffb3127242b0b4cbf4472019e022ade021eec44838ff19f1dac2625dfd11dd459d7e1e055b0698a8d52fec
+ checksum: 10c0/73304caafd00fdc5b0168e693ac15bf25b6357dec76d1195fcd628fe2cf99c46f9c889a7ecfa3cfe236dbd2d5ce3e27a6ccc4370b46d475d0d19081e11f86019
languageName: node
linkType: hard
diff --git a/packages/twenty-apps/examples/postcard/yarn.lock b/packages/twenty-apps/examples/postcard/yarn.lock
index d4f089382c5..1670209aa92 100644
--- a/packages/twenty-apps/examples/postcard/yarn.lock
+++ b/packages/twenty-apps/examples/postcard/yarn.lock
@@ -1263,11 +1263,11 @@ __metadata:
linkType: hard
"brace-expansion@npm:^5.0.5":
- version: 5.0.9
- resolution: "brace-expansion@npm:5.0.9"
+ version: 5.0.8
+ resolution: "brace-expansion@npm:5.0.8"
dependencies:
balanced-match: "npm:^4.0.2"
- checksum: 10c0/3dea38884a1c3c8b1c9c44a7402a0c76fca460f70cffb3127242b0b4cbf4472019e022ade021eec44838ff19f1dac2625dfd11dd459d7e1e055b0698a8d52fec
+ checksum: 10c0/73304caafd00fdc5b0168e693ac15bf25b6357dec76d1195fcd628fe2cf99c46f9c889a7ecfa3cfe236dbd2d5ce3e27a6ccc4370b46d475d0d19081e11f86019
languageName: node
linkType: hard
diff --git a/packages/twenty-apps/fixtures/rich-app/src/fields/post-card-recipients-on-post-card.field.ts b/packages/twenty-apps/fixtures/rich-app/src/fields/post-card-recipients-on-post-card.field.ts
index aa4136efaf9..65d8faf88dd 100644
--- a/packages/twenty-apps/fixtures/rich-app/src/fields/post-card-recipients-on-post-card.field.ts
+++ b/packages/twenty-apps/fixtures/rich-app/src/fields/post-card-recipients-on-post-card.field.ts
@@ -1,6 +1,7 @@
import { POST_CARD_RECIPIENT_UNIVERSAL_IDENTIFIER } from '../objects/post-card-recipient.object';
import { defineField, FieldType, RelationType } from 'twenty-sdk/define';
import { POST_CARD_UNIVERSAL_IDENTIFIER } from '../objects/post-card.object';
+import { RECIPIENT_ON_POST_CARD_RECIPIENT_ID } from './post-card-recipients-on-recipient.field';
export const POST_CARD_RECIPIENTS_ON_POST_CARD_ID =
'a1a2b3c4-0001-4a7b-8c9d-0e1f2a3b4c5d';
@@ -19,5 +20,6 @@ export default defineField({
POST_CARD_ON_POST_CARD_RECIPIENT_ID,
universalSettings: {
relationType: RelationType.ONE_TO_MANY,
+ junctionTargetFieldUniversalIdentifier: RECIPIENT_ON_POST_CARD_RECIPIENT_ID,
},
});
diff --git a/packages/twenty-apps/fixtures/rich-app/src/logic-functions/on-post-card-created.function.ts b/packages/twenty-apps/fixtures/rich-app/src/logic-functions/on-post-card-created.function.ts
index be4de6352b9..d4ff33fc2f1 100644
--- a/packages/twenty-apps/fixtures/rich-app/src/logic-functions/on-post-card-created.function.ts
+++ b/packages/twenty-apps/fixtures/rich-app/src/logic-functions/on-post-card-created.function.ts
@@ -1,6 +1,22 @@
-import { defineLogicFunction } from 'twenty-sdk/define';
+import {
+ defineLogicFunction,
+ type DatabaseEventPayload,
+ type ObjectRecordCreateEvent,
+} from 'twenty-sdk/define';
+import { createTimelineActivity } from 'twenty-sdk/logic-function';
+
+import { POST_CARD_UNIVERSAL_IDENTIFIER } from '../objects/post-card.object';
+
+const handler = async (
+ payload: DatabaseEventPayload<ObjectRecordCreateEvent<{ id: string }>>,
+) => {
+ await createTimelineActivity({
+ timelineActivityTypeUniversalIdentifier:
+ 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7500',
+ targetObjectUniversalIdentifier: POST_CARD_UNIVERSAL_IDENTIFIER,
+ targetRecordId: payload.properties.after.id,
+ });
-const handler = async () => {
return { processed: true };
};
diff --git a/packages/twenty-apps/fixtures/rich-app/src/roles/default-function.role.ts b/packages/twenty-apps/fixtures/rich-app/src/roles/default-function.role.ts
index a0944cf5d6b..1e7e19f5259 100644
--- a/packages/twenty-apps/fixtures/rich-app/src/roles/default-function.role.ts
+++ b/packages/twenty-apps/fixtures/rich-app/src/roles/default-function.role.ts
@@ -1,4 +1,5 @@
import { SystemPermissionFlag, defineRole } from 'twenty-sdk/define';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import {
CONTENT_FIELD_UNIVERSAL_IDENTIFIER,
POST_CARD_UNIVERSAL_IDENTIFIER,
@@ -27,6 +28,14 @@ export default defineRole({
canSoftDeleteObjectRecords: false,
canDestroyObjectRecords: false,
},
+ {
+ objectUniversalIdentifier:
+ STANDARD_OBJECTS.timelineActivity.universalIdentifier,
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: true,
+ canSoftDeleteObjectRecords: false,
+ canDestroyObjectRecords: false,
+ },
],
fieldPermissions: [
{
diff --git a/packages/twenty-apps/fixtures/rich-app/src/timeline-activity-types/post-card-created.timeline-activity-type.ts b/packages/twenty-apps/fixtures/rich-app/src/timeline-activity-types/post-card-created.timeline-activity-type.ts
new file mode 100644
index 00000000000..6fc512ed1e5
--- /dev/null
+++ b/packages/twenty-apps/fixtures/rich-app/src/timeline-activity-types/post-card-created.timeline-activity-type.ts
@@ -0,0 +1,9 @@
+import { defineTimelineActivityType } from 'twenty-sdk/define';
+
+export default defineTimelineActivityType({
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7500',
+ name: 'postCardCreated',
+ label: 'created a post card',
+ icon: 'IconMail',
+ frontComponentUniversalIdentifier: '88c15ae2-5f87-4a6b-b48f-1974bbe62eb7',
+});
diff --git a/packages/twenty-apps/fixtures/rich-app/src/timeline-activity-types/post-card-linked.timeline-activity-type.ts b/packages/twenty-apps/fixtures/rich-app/src/timeline-activity-types/post-card-linked.timeline-activity-type.ts
new file mode 100644
index 00000000000..51c4b5840f3
--- /dev/null
+++ b/packages/twenty-apps/fixtures/rich-app/src/timeline-activity-types/post-card-linked.timeline-activity-type.ts
@@ -0,0 +1,19 @@
+import { defineTimelineActivityType } from 'twenty-sdk/define';
+
+import { POST_CARD_RECIPIENTS_ON_POST_CARD_ID } from '../fields/post-card-recipients-on-post-card.field';
+import { POST_CARD_UNIVERSAL_IDENTIFIER } from '../objects/post-card.object';
+
+export default defineTimelineActivityType({
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7501',
+ name: 'postCardLinked',
+ label: 'received a post card',
+ icon: 'IconMail',
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier: POST_CARD_UNIVERSAL_IDENTIFIER,
+ through: {
+ relationFieldUniversalIdentifier: POST_CARD_RECIPIENTS_ON_POST_CARD_ID,
+ },
+ },
+ frontComponentUniversalIdentifier: '88c15ae2-5f87-4a6b-b48f-1974bbe62eb7',
+});
diff --git a/packages/twenty-apps/internal/self-hosting/yarn.lock b/packages/twenty-apps/internal/self-hosting/yarn.lock
index 043b7a3bdc3..a9ed3caed45 100644
--- a/packages/twenty-apps/internal/self-hosting/yarn.lock
+++ b/packages/twenty-apps/internal/self-hosting/yarn.lock
@@ -1341,11 +1341,11 @@ __metadata:
linkType: hard
"brace-expansion@npm:^5.0.5":
- version: 5.0.9
- resolution: "brace-expansion@npm:5.0.9"
+ version: 5.0.8
+ resolution: "brace-expansion@npm:5.0.8"
dependencies:
balanced-match: "npm:^4.0.2"
- checksum: 10c0/3dea38884a1c3c8b1c9c44a7402a0c76fca460f70cffb3127242b0b4cbf4472019e022ade021eec44838ff19f1dac2625dfd11dd459d7e1e055b0698a8d52fec
+ checksum: 10c0/73304caafd00fdc5b0168e693ac15bf25b6357dec76d1195fcd628fe2cf99c46f9c889a7ecfa3cfe236dbd2d5ce3e27a6ccc4370b46d475d0d19081e11f86019
languageName: node
linkType: hard
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 14b5fe08a34..e4d0c6e0758 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -3187,14 +3187,30 @@ enum MetadataTranslationProvenance {
INHERITED
}
+type TimelineActivityTypeEmitThrough {
+ relationFieldUniversalIdentifier: UUID!
+ triggerFieldUniversalIdentifiers: [UUID!]
+}
+
+type TimelineActivityTypeEmit {
+ on: String!
+ objectUniversalIdentifier: UUID
+ through: TimelineActivityTypeEmitThrough
+}
+
type TimelineActivityType {
id: UUID!
+ universalIdentifier: UUID!
name: String!
label: String!
- action: String
+ emit: TimelineActivityTypeEmit
+ action: String @deprecated(reason: "Use emit.on")
icon: String
- renderer: String
- objectUniversalIdentifier: UUID
+ renderer: String @deprecated(reason: "Use frontComponentUniversalIdentifier")
+ frontComponentUniversalIdentifier: UUID
+ objectUniversalIdentifier: UUID @deprecated(reason: "Use emit.objectUniversalIdentifier")
+ replacesTimelineActivityTypeUniversalIdentifier: UUID
+ isActive: Boolean!
applicationId: UUID
createdAt: DateTime!
updatedAt: DateTime!
@@ -3418,6 +3434,7 @@ input ObjectFilter {
and: [ObjectFilter!]
or: [ObjectFilter!]
id: UUIDFilterComparison
+ universalIdentifier: UUIDFilterComparison
isActive: BooleanFieldComparison
isRemote: BooleanFieldComparison
isSearchable: BooleanFieldComparison
@@ -3707,6 +3724,8 @@ type Mutation {
deactivateSkill(id: UUID!): Skill!
evaluateAgentTurn(turnId: UUID!): AgentTurnEvaluation!
runEvaluationInput(agentId: UUID!, input: String!): AgentTurn!
+ updateTimelineActivityType(input: UpdateTimelineActivityTypeInput!): TimelineActivityType!
+ resetTimelineActivityType(id: UUID!): TimelineActivityType!
getAuthorizationUrlForSSO(input: GetAuthorizationUrlForSSOInput!): GetAuthorizationUrlForSSO!
getLoginTokenFromCredentials(email: String!, password: String!, captchaToken: String, locale: String, verifyEmailRedirectPath: String, origin: String!): LoginToken!
signIn(email: String!, password: String!, captchaToken: String, locale: String, verifyEmailRedirectPath: String): AvailableWorkspacesAndAccessTokens!
@@ -4911,6 +4930,14 @@ input UpdateSkillInput {
isActive: Boolean
}
+input UpdateTimelineActivityTypeInput {
+ id: UUID!
+ label: String
+ icon: String
+ isActive: Boolean
+ translations: [MetadataTranslationOverrideInput!]
+}
+
input GetAuthorizationUrlForSSOInput {
identityProviderId: UUID!
workspaceInviteHash: String
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 350893b72a3..7df71906fbd 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -2831,14 +2831,35 @@ export interface MetadataTranslation {
/** Where a resolved metadata label comes from: a workspace-authored translation, a shipped application catalog, or inheritance from the canonical value */
export type MetadataTranslationProvenance = 'WORKSPACE' | 'SHIPPED' | 'INHERITED'
+export interface TimelineActivityTypeEmitThrough {
+ relationFieldUniversalIdentifier: Scalars['UUID']
+ triggerFieldUniversalIdentifiers?: Scalars['UUID'][]
+ __typename: 'TimelineActivityTypeEmitThrough'
+}
+
+export interface TimelineActivityTypeEmit {
+ on: Scalars['String']
+ objectUniversalIdentifier?: Scalars['UUID']
+ through?: TimelineActivityTypeEmitThrough
+ __typename: 'TimelineActivityTypeEmit'
+}
+
export interface TimelineActivityType {
id: Scalars['UUID']
+ universalIdentifier: Scalars['UUID']
name: Scalars['String']
label: Scalars['String']
+ emit?: TimelineActivityTypeEmit
+ /** @deprecated Use emit.on */
action?: Scalars['String']
icon?: Scalars['String']
+ /** @deprecated Use frontComponentUniversalIdentifier */
renderer?: Scalars['String']
+ frontComponentUniversalIdentifier?: Scalars['UUID']
+ /** @deprecated Use emit.objectUniversalIdentifier */
objectUniversalIdentifier?: Scalars['UUID']
+ replacesTimelineActivityTypeUniversalIdentifier?: Scalars['UUID']
+ isActive: Scalars['Boolean']
applicationId?: Scalars['UUID']
createdAt: Scalars['DateTime']
updatedAt: Scalars['DateTime']
@@ -3199,6 +3220,8 @@ export interface Mutation {
deactivateSkill: Skill
evaluateAgentTurn: AgentTurnEvaluation
runEvaluationInput: AgentTurn
+ updateTimelineActivityType: TimelineActivityType
+ resetTimelineActivityType: TimelineActivityType
getAuthorizationUrlForSSO: GetAuthorizationUrlForSSO
getLoginTokenFromCredentials: LoginToken
signIn: AvailableWorkspacesAndAccessTokens
@@ -6225,14 +6248,37 @@ export interface MetadataTranslationGenqlSelection{
__scalar?: boolean | number
}
+export interface TimelineActivityTypeEmitThroughGenqlSelection{
+ relationFieldUniversalIdentifier?: boolean | number
+ triggerFieldUniversalIdentifiers?: boolean | number
+ __typename?: boolean | number
+ __scalar?: boolean | number
+}
+
+export interface TimelineActivityTypeEmitGenqlSelection{
+ on?: boolean | number
+ objectUniversalIdentifier?: boolean | number
+ through?: TimelineActivityTypeEmitThroughGenqlSelection
+ __typename?: boolean | number
+ __scalar?: boolean | number
+}
+
export interface TimelineActivityTypeGenqlSelection{
id?: boolean | number
+ universalIdentifier?: boolean | number
name?: boolean | number
label?: boolean | number
+ emit?: TimelineActivityTypeEmitGenqlSelection
+ /** @deprecated Use emit.on */
action?: boolean | number
icon?: boolean | number
+ /** @deprecated Use frontComponentUniversalIdentifier */
renderer?: boolean | number
+ frontComponentUniversalIdentifier?: boolean | number
+ /** @deprecated Use emit.objectUniversalIdentifier */
objectUniversalIdentifier?: boolean | number
+ replacesTimelineActivityTypeUniversalIdentifier?: boolean | number
+ isActive?: boolean | number
applicationId?: boolean | number
createdAt?: boolean | number
updatedAt?: boolean | number
@@ -6420,7 +6466,7 @@ export interface AgentIdInput {
/** The id of the agent. */
id: Scalars['UUID']}
-export interface ObjectFilter {and?: (ObjectFilter[] | null),or?: (ObjectFilter[] | null),id?: (UUIDFilterComparison | null),isActive?: (BooleanFieldComparison | null),isRemote?: (BooleanFieldComparison | null),isSearchable?: (BooleanFieldComparison | null),isSystem?: (BooleanFieldComparison | null),isUICreatable?: (BooleanFieldComparison | null),isUIEditable?: (BooleanFieldComparison | null),isUIReadOnly?: (BooleanFieldComparison | null)}
+export interface ObjectFilter {and?: (ObjectFilter[] | null),or?: (ObjectFilter[] | null),id?: (UUIDFilterComparison | null),universalIdentifier?: (UUIDFilterComparison | null),isActive?: (BooleanFieldComparison | null),isRemote?: (BooleanFieldComparison | null),isSearchable?: (BooleanFieldComparison | null),isSystem?: (BooleanFieldComparison | null),isUICreatable?: (BooleanFieldComparison | null),isUIEditable?: (BooleanFieldComparison | null),isUIReadOnly?: (BooleanFieldComparison | null)}
export interface LogicFunctionIdInput {
/** The id of the function. */
@@ -6639,6 +6685,8 @@ export interface MutationGenqlSelection{
deactivateSkill?: (SkillGenqlSelection & { __args: {id: Scalars['UUID']} })
evaluateAgentTurn?: (AgentTurnEvaluationGenqlSelection & { __args: {turnId: Scalars['UUID']} })
runEvaluationInput?: (AgentTurnGenqlSelection & { __args: {agentId: Scalars['UUID'], input: Scalars['String']} })
+ updateTimelineActivityType?: (TimelineActivityTypeGenqlSelection & { __args: {input: UpdateTimelineActivityTypeInput} })
+ resetTimelineActivityType?: (TimelineActivityTypeGenqlSelection & { __args: {id: Scalars['UUID']} })
getAuthorizationUrlForSSO?: (GetAuthorizationUrlForSSOGenqlSelection & { __args: {input: GetAuthorizationUrlForSSOInput} })
getLoginTokenFromCredentials?: (LoginTokenGenqlSelection & { __args: {email: Scalars['String'], password: Scalars['String'], captchaToken?: (Scalars['String'] | null), locale?: (Scalars['String'] | null), verifyEmailRedirectPath?: (Scalars['String'] | null), origin: Scalars['String']} })
signIn?: (AvailableWorkspacesAndAccessTokensGenqlSelection & { __args: {email: Scalars['String'], password: Scalars['String'], captchaToken?: (Scalars['String'] | null), locale?: (Scalars['String'] | null), verifyEmailRedirectPath?: (Scalars['String'] | null)} })
@@ -7073,6 +7121,8 @@ export interface CreateSkillInput {id?: (Scalars['UUID'] | null),name: Scalars['
export interface UpdateSkillInput {id: Scalars['UUID'],name?: (Scalars['String'] | null),label?: (Scalars['String'] | null),icon?: (Scalars['String'] | null),description?: (Scalars['String'] | null),content?: (Scalars['String'] | null),isActive?: (Scalars['Boolean'] | null)}
+export interface UpdateTimelineActivityTypeInput {id: Scalars['UUID'],label?: (Scalars['String'] | null),icon?: (Scalars['String'] | null),isActive?: (Scalars['Boolean'] | null),translations?: (MetadataTranslationOverrideInput[] | null)}
+
export interface GetAuthorizationUrlForSSOInput {identityProviderId: Scalars['UUID'],workspaceInviteHash?: (Scalars['String'] | null)}
export interface SignUpInNewWorkspaceInput {displayName?: (Scalars['String'] | null),subdomain?: (Scalars['String'] | null)}
@@ -9231,6 +9281,22 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
+ const TimelineActivityTypeEmitThrough_possibleTypes: string[] = ['TimelineActivityTypeEmitThrough']
+ export const isTimelineActivityTypeEmitThrough = (obj?: { __typename?: any } | null): obj is TimelineActivityTypeEmitThrough => {
+ if (!obj?.__typename) throw new Error('__typename is missing in "isTimelineActivityTypeEmitThrough"')
+ return TimelineActivityTypeEmitThrough_possibleTypes.includes(obj.__typename)
+ }
+
+
+
+ const TimelineActivityTypeEmit_possibleTypes: string[] = ['TimelineActivityTypeEmit']
+ export const isTimelineActivityTypeEmit = (obj?: { __typename?: any } | null): obj is TimelineActivityTypeEmit => {
+ if (!obj?.__typename) throw new Error('__typename is missing in "isTimelineActivityTypeEmit"')
+ return TimelineActivityTypeEmit_possibleTypes.includes(obj.__typename)
+ }
+
+
+
const TimelineActivityType_possibleTypes: string[] = ['TimelineActivityType']
export const isTimelineActivityType = (obj?: { __typename?: any } | null): obj is TimelineActivityType => {
if (!obj?.__typename) throw new Error('__typename is missing in "isTimelineActivityType"')
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index d9aba62090a..b2a2c7e4f87 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -86,13 +86,13 @@ export default {
351,
353,
355,
- 358,
- 372,
- 379,
- 386,
- 387,
- 500,
- 522
+ 360,
+ 374,
+ 381,
+ 388,
+ 389,
+ 502,
+ 525
],
"types": {
"BillingProductDTO": {
@@ -6324,16 +6324,47 @@ export default {
]
},
"MetadataTranslationProvenance": {},
+ "TimelineActivityTypeEmitThrough": {
+ "relationFieldUniversalIdentifier": [
+ 3
+ ],
+ "triggerFieldUniversalIdentifiers": [
+ 3
+ ],
+ "__typename": [
+ 1
+ ]
+ },
+ "TimelineActivityTypeEmit": {
+ "on": [
+ 1
+ ],
+ "objectUniversalIdentifier": [
+ 3
+ ],
+ "through": [
+ 356
+ ],
+ "__typename": [
+ 1
+ ]
+ },
"TimelineActivityType": {
"id": [
3
],
+ "universalIdentifier": [
+ 3
+ ],
"name": [
1
],
"label": [
1
],
+ "emit": [
+ 357
+ ],
"action": [
1
],
@@ -6343,9 +6374,18 @@ export default {
"renderer": [
1
],
+ "frontComponentUniversalIdentifier": [
+ 3
+ ],
"objectUniversalIdentifier": [
3
],
+ "replacesTimelineActivityTypeUniversalIdentifier": [
+ 3
+ ],
+ "isActive": [
+ 8
+ ],
"applicationId": [
3
],
@@ -6361,7 +6401,7 @@ export default {
},
"CollectionHash": {
"collectionName": [
- 358
+ 360
],
"hash": [
1
@@ -6425,13 +6465,13 @@ export default {
},
"MinimalMetadata": {
"objectMetadataItems": [
- 359
+ 361
],
"views": [
- 360
+ 362
],
"collectionHashes": [
- 357
+ 359
],
"__typename": [
1
@@ -6605,7 +6645,7 @@ export default {
2,
{
"input": [
- 363,
+ 365,
"GetApiKeyInput!"
]
}
@@ -6711,7 +6751,7 @@ export default {
10,
{
"input": [
- 364,
+ 366,
"AgentIdInput!"
]
}
@@ -6724,7 +6764,7 @@ export default {
"CursorPaging!"
],
"filter": [
- 365,
+ 367,
"ObjectFilter!"
]
}
@@ -6754,7 +6794,7 @@ export default {
21,
{
"input": [
- 366,
+ 368,
"LogicFunctionIdInput!"
]
}
@@ -6766,7 +6806,7 @@ export default {
9,
{
"input": [
- 366,
+ 368,
"LogicFunctionIdInput!"
]
}
@@ -6775,7 +6815,7 @@ export default {
1,
{
"input": [
- 366,
+ 368,
"LogicFunctionIdInput!"
]
}
@@ -6997,7 +7037,7 @@ export default {
294,
{
"input": [
- 367,
+ 369,
"PreviewMessageCampaignAudienceInput!"
]
}
@@ -7006,7 +7046,7 @@ export default {
301,
{
"input": [
- 368,
+ 370,
"FindMessageSuppressionsInput!"
]
}
@@ -7069,7 +7109,7 @@ export default {
}
],
"minimalMetadata": [
- 361
+ 363
],
"appKeyValue": [
345,
@@ -7087,7 +7127,7 @@ export default {
204,
{
"filter": [
- 369
+ 371
]
}
],
@@ -7158,13 +7198,13 @@ export default {
}
],
"timelineActivityTypes": [
- 356
+ 358
],
"metadataTranslations": [
354,
{
"input": [
- 370,
+ 372,
"MetadataTranslationsInput!"
]
}
@@ -7230,7 +7270,7 @@ export default {
329,
{
"input": [
- 371,
+ 373,
"EventLogQueryInput!"
]
}
@@ -7239,7 +7279,7 @@ export default {
323,
{
"input": [
- 375,
+ 377,
"PieChartDataInput!"
]
}
@@ -7248,7 +7288,7 @@ export default {
321,
{
"input": [
- 376,
+ 378,
"LineChartDataInput!"
]
}
@@ -7257,7 +7297,7 @@ export default {
318,
{
"input": [
- 377,
+ 379,
"BarChartDataInput!"
]
}
@@ -7307,7 +7347,7 @@ export default {
276,
{
"input": [
- 378
+ 380
]
}
],
@@ -7339,14 +7379,17 @@ export default {
},
"ObjectFilter": {
"and": [
- 365
+ 367
],
"or": [
- 365
+ 367
],
"id": [
29
],
+ "universalIdentifier": [
+ 29
+ ],
"isActive": [
30
],
@@ -7441,10 +7484,10 @@ export default {
},
"EventLogQueryInput": {
"table": [
- 372
+ 374
],
"filters": [
- 373
+ 375
],
"first": [
26
@@ -7465,7 +7508,7 @@ export default {
1
],
"dateRange": [
- 374
+ 376
],
"recordId": [
1
@@ -7532,7 +7575,7 @@ export default {
1
],
"operationTypes": [
- 379
+ 381
],
"__typename": [
1
@@ -7544,7 +7587,7 @@ export default {
8,
{
"input": [
- 381,
+ 383,
"AddQuerySubscriptionInput!"
]
}
@@ -7553,7 +7596,7 @@ export default {
8,
{
"input": [
- 382,
+ 384,
"RemoveQueryFromEventStreamInput!"
]
}
@@ -7562,7 +7605,7 @@ export default {
150,
{
"inputs": [
- 383,
+ 385,
"[CreateNavigationMenuItemInput!]!"
]
}
@@ -7571,7 +7614,7 @@ export default {
150,
{
"input": [
- 383,
+ 385,
"CreateNavigationMenuItemInput!"
]
}
@@ -7580,7 +7623,7 @@ export default {
150,
{
"inputs": [
- 384,
+ 386,
"[UpdateOneNavigationMenuItemInput!]!"
]
}
@@ -7589,7 +7632,7 @@ export default {
150,
{
"input": [
- 384,
+ 386,
"UpdateOneNavigationMenuItemInput!"
]
}
@@ -7624,7 +7667,7 @@ export default {
"Float!"
],
"fileFolder": [
- 386,
+ 388,
"FileFolder!"
],
"fieldMetadataId": [
@@ -7663,7 +7706,7 @@ export default {
147,
{
"file": [
- 387,
+ 389,
"Upload!"
]
}
@@ -7672,7 +7715,7 @@ export default {
147,
{
"file": [
- 387,
+ 389,
"Upload!"
]
}
@@ -7681,7 +7724,7 @@ export default {
147,
{
"file": [
- 387,
+ 389,
"Upload!"
]
}
@@ -7690,7 +7733,7 @@ export default {
147,
{
"file": [
- 387,
+ 389,
"Upload!"
]
}
@@ -7699,7 +7742,7 @@ export default {
147,
{
"file": [
- 387,
+ 389,
"Upload!"
]
}
@@ -7708,7 +7751,7 @@ export default {
147,
{
"file": [
- 387,
+ 389,
"Upload!"
],
"fieldMetadataId": [
@@ -7721,7 +7764,7 @@ export default {
147,
{
"file": [
- 387,
+ 389,
"Upload!"
],
"fieldMetadataUniversalIdentifier": [
@@ -7734,7 +7777,7 @@ export default {
53,
{
"input": [
- 388,
+ 390,
"CreateViewFilterGroupInput!"
]
}
@@ -7747,7 +7790,7 @@ export default {
"String!"
],
"input": [
- 389,
+ 391,
"UpdateViewFilterGroupInput!"
]
}
@@ -7774,7 +7817,7 @@ export default {
55,
{
"input": [
- 390,
+ 392,
"CreateViewFilterInput!"
]
}
@@ -7783,7 +7826,7 @@ export default {
55,
{
"input": [
- 391,
+ 393,
"UpdateViewFilterInput!"
]
}
@@ -7792,7 +7835,7 @@ export default {
55,
{
"input": [
- 393,
+ 395,
"DeleteViewFilterInput!"
]
}
@@ -7801,7 +7844,7 @@ export default {
55,
{
"input": [
- 394,
+ 396,
"DestroyViewFilterInput!"
]
}
@@ -7810,7 +7853,7 @@ export default {
61,
{
"input": [
- 395,
+ 397,
"CreateViewInput!"
]
}
@@ -7823,7 +7866,7 @@ export default {
"String!"
],
"input": [
- 396,
+ 398,
"UpdateViewInput!"
]
}
@@ -7850,7 +7893,7 @@ export default {
61,
{
"input": [
- 397,
+ 399,
"UpsertViewWidgetInput!"
]
}
@@ -7859,7 +7902,7 @@ export default {
58,
{
"input": [
- 403,
+ 405,
"CreateViewSortInput!"
]
}
@@ -7868,7 +7911,7 @@ export default {
58,
{
"input": [
- 404,
+ 406,
"UpdateViewSortInput!"
]
}
@@ -7877,7 +7920,7 @@ export default {
8,
{
"input": [
- 406,
+ 408,
"DeleteViewSortInput!"
]
}
@@ -7886,7 +7929,7 @@ export default {
8,
{
"input": [
- 407,
+ 409,
"DestroyViewSortInput!"
]
}
@@ -7895,7 +7938,7 @@ export default {
51,
{
"input": [
- 408,
+ 410,
"UpdateViewFieldInput!"
]
}
@@ -7904,7 +7947,7 @@ export default {
51,
{
"input": [
- 410,
+ 412,
"CreateViewFieldInput!"
]
}
@@ -7913,7 +7956,7 @@ export default {
51,
{
"inputs": [
- 410,
+ 412,
"[CreateViewFieldInput!]!"
]
}
@@ -7922,7 +7965,7 @@ export default {
51,
{
"input": [
- 411,
+ 413,
"DeleteViewFieldInput!"
]
}
@@ -7931,7 +7974,7 @@ export default {
51,
{
"input": [
- 412,
+ 414,
"DestroyViewFieldInput!"
]
}
@@ -7940,7 +7983,7 @@ export default {
60,
{
"input": [
- 413,
+ 415,
"UpdateViewFieldGroupInput!"
]
}
@@ -7949,7 +7992,7 @@ export default {
60,
{
"input": [
- 415,
+ 417,
"CreateViewFieldGroupInput!"
]
}
@@ -7958,7 +8001,7 @@ export default {
60,
{
"inputs": [
- 415,
+ 417,
"[CreateViewFieldGroupInput!]!"
]
}
@@ -7967,7 +8010,7 @@ export default {
60,
{
"input": [
- 416,
+ 418,
"DeleteViewFieldGroupInput!"
]
}
@@ -7976,7 +8019,7 @@ export default {
60,
{
"input": [
- 417,
+ 419,
"DestroyViewFieldGroupInput!"
]
}
@@ -7985,7 +8028,7 @@ export default {
61,
{
"input": [
- 418,
+ 420,
"UpsertFieldsWidgetInput!"
]
}
@@ -7994,7 +8037,7 @@ export default {
2,
{
"input": [
- 421,
+ 423,
"CreateApiKeyInput!"
]
}
@@ -8003,7 +8046,7 @@ export default {
2,
{
"input": [
- 422,
+ 424,
"UpdateApiKeyInput!"
]
}
@@ -8012,7 +8055,7 @@ export default {
2,
{
"input": [
- 423,
+ 425,
"RevokeApiKeyInput!"
]
}
@@ -8205,7 +8248,7 @@ export default {
146,
{
"input": [
- 424,
+ 426,
"CreateApprovedAccessDomainInput!"
]
}
@@ -8214,7 +8257,7 @@ export default {
8,
{
"input": [
- 425,
+ 427,
"DeleteApprovedAccessDomainInput!"
]
}
@@ -8223,7 +8266,7 @@ export default {
146,
{
"input": [
- 426,
+ 428,
"ValidateApprovedAccessDomainInput!"
]
}
@@ -8232,7 +8275,7 @@ export default {
120,
{
"input": [
- 427,
+ 429,
"CreatePageLayoutTabInput!"
]
}
@@ -8245,7 +8288,7 @@ export default {
"String!"
],
"input": [
- 428,
+ 430,
"UpdatePageLayoutTabInput!"
]
}
@@ -8263,7 +8306,7 @@ export default {
121,
{
"input": [
- 429,
+ 431,
"CreatePageLayoutInput!"
]
}
@@ -8276,7 +8319,7 @@ export default {
"String!"
],
"input": [
- 430,
+ 432,
"UpdatePageLayoutInput!"
]
}
@@ -8298,7 +8341,7 @@ export default {
"String!"
],
"input": [
- 431,
+ 433,
"UpdatePageLayoutWithTabsInput!"
]
}
@@ -8334,7 +8377,7 @@ export default {
78,
{
"input": [
- 435,
+ 437,
"CreatePageLayoutWidgetInput!"
]
}
@@ -8347,7 +8390,7 @@ export default {
"String!"
],
"input": [
- 436,
+ 438,
"UpdatePageLayoutWidgetInput!"
]
}
@@ -8365,7 +8408,7 @@ export default {
10,
{
"input": [
- 437,
+ 439,
"CreateAgentInput!"
]
}
@@ -8374,7 +8417,7 @@ export default {
10,
{
"input": [
- 438,
+ 440,
"UpdateAgentInput!"
]
}
@@ -8383,7 +8426,7 @@ export default {
10,
{
"input": [
- 364,
+ 366,
"AgentIdInput!"
]
}
@@ -8392,7 +8435,7 @@ export default {
23,
{
"input": [
- 439,
+ 441,
"CreateOneObjectInput!"
]
}
@@ -8401,7 +8444,7 @@ export default {
23,
{
"input": [
- 441,
+ 443,
"DeleteOneObjectInput!"
]
}
@@ -8410,7 +8453,7 @@ export default {
23,
{
"input": [
- 442,
+ 444,
"UpdateOneObjectInput!"
]
}
@@ -8419,7 +8462,7 @@ export default {
232,
{
"input": [
- 445,
+ 447,
"CreateOneIndexInput!"
]
}
@@ -8428,7 +8471,7 @@ export default {
232,
{
"input": [
- 448,
+ 450,
"DeleteOneIndexInput!"
]
}
@@ -8437,7 +8480,7 @@ export default {
21,
{
"input": [
- 366,
+ 368,
"LogicFunctionIdInput!"
]
}
@@ -8446,7 +8489,7 @@ export default {
21,
{
"input": [
- 449,
+ 451,
"CreateLogicFunctionFromSourceInput!"
]
}
@@ -8455,7 +8498,7 @@ export default {
142,
{
"input": [
- 450,
+ 452,
"ExecuteOneLogicFunctionInput!"
]
}
@@ -8464,7 +8507,7 @@ export default {
8,
{
"input": [
- 451,
+ 453,
"UpdateLogicFunctionFromSourceInput!"
]
}
@@ -8473,7 +8516,7 @@ export default {
14,
{
"input": [
- 453,
+ 455,
"CreateCommandMenuItemInput!"
]
}
@@ -8482,7 +8525,7 @@ export default {
14,
{
"input": [
- 454,
+ 456,
"UpdateCommandMenuItemInput!"
]
}
@@ -8509,7 +8552,7 @@ export default {
13,
{
"input": [
- 455,
+ 457,
"CreateFrontComponentInput!"
]
}
@@ -8518,7 +8561,7 @@ export default {
13,
{
"input": [
- 456,
+ 458,
"UpdateFrontComponentInput!"
]
}
@@ -8536,7 +8579,7 @@ export default {
67,
{
"data": [
- 458,
+ 460,
"ActivateWorkspaceInput!"
]
}
@@ -8545,7 +8588,7 @@ export default {
67,
{
"data": [
- 459,
+ 461,
"UpdateWorkspaceInput!"
]
}
@@ -8576,7 +8619,7 @@ export default {
201,
{
"input": [
- 460,
+ 462,
"CreateApplicationRegistrationInput!"
]
}
@@ -8585,7 +8628,7 @@ export default {
73,
{
"input": [
- 461,
+ 463,
"UpdateApplicationRegistrationInput!"
]
}
@@ -8612,7 +8655,7 @@ export default {
174,
{
"input": [
- 463,
+ 465,
"CreateApplicationRegistrationVariableInput!"
]
}
@@ -8621,7 +8664,7 @@ export default {
174,
{
"input": [
- 464,
+ 466,
"UpdateApplicationRegistrationVariableInput!"
]
}
@@ -8639,7 +8682,7 @@ export default {
73,
{
"file": [
- 387,
+ 389,
"Upload!"
],
"universalIdentifier": [
@@ -8701,7 +8744,7 @@ export default {
"UUID!"
],
"input": [
- 466,
+ 468,
"UpdateApplicationInput!"
]
}
@@ -8722,7 +8765,7 @@ export default {
224,
{
"input": [
- 467,
+ 469,
"CreateOneFieldMetadataInput!"
]
}
@@ -8731,7 +8774,7 @@ export default {
224,
{
"input": [
- 469,
+ 471,
"UpdateOneFieldMetadataInput!"
]
}
@@ -8740,7 +8783,7 @@ export default {
224,
{
"input": [
- 471,
+ 473,
"DeleteOneFieldInput!"
]
}
@@ -8749,7 +8792,7 @@ export default {
57,
{
"input": [
- 472,
+ 474,
"CreateViewGroupInput!"
]
}
@@ -8758,7 +8801,7 @@ export default {
57,
{
"inputs": [
- 472,
+ 474,
"[CreateViewGroupInput!]!"
]
}
@@ -8767,7 +8810,7 @@ export default {
57,
{
"input": [
- 473,
+ 475,
"UpdateViewGroupInput!"
]
}
@@ -8776,7 +8819,7 @@ export default {
57,
{
"inputs": [
- 473,
+ 475,
"[UpdateViewGroupInput!]!"
]
}
@@ -8785,7 +8828,7 @@ export default {
57,
{
"input": [
- 475,
+ 477,
"DeleteViewGroupInput!"
]
}
@@ -8794,7 +8837,7 @@ export default {
57,
{
"input": [
- 476,
+ 478,
"DestroyViewGroupInput!"
]
}
@@ -8816,7 +8859,7 @@ export default {
46,
{
"createRoleInput": [
- 477,
+ 479,
"CreateRoleInput!"
]
}
@@ -8825,7 +8868,7 @@ export default {
46,
{
"updateRoleInput": [
- 478,
+ 480,
"UpdateRoleInput!"
]
}
@@ -8843,7 +8886,7 @@ export default {
43,
{
"upsertObjectPermissionsInput": [
- 480,
+ 482,
"UpsertObjectPermissionsInput!"
]
}
@@ -8852,7 +8895,7 @@ export default {
44,
{
"upsertPermissionFlagsInput": [
- 482,
+ 484,
"UpsertPermissionFlagsInput!"
]
}
@@ -8861,7 +8904,7 @@ export default {
38,
{
"upsertFieldPermissionsInput": [
- 483,
+ 485,
"UpsertFieldPermissionsInput!"
]
}
@@ -8870,7 +8913,7 @@ export default {
245,
{
"input": [
- 485,
+ 487,
"UpsertRowLevelPermissionPredicatesInput!"
]
}
@@ -8901,7 +8944,7 @@ export default {
295,
{
"input": [
- 488,
+ 490,
"SendEmailViaDomainInput!"
]
}
@@ -8910,7 +8953,7 @@ export default {
297,
{
"input": [
- 489,
+ 491,
"SendMessageCampaignInput!"
]
}
@@ -8919,7 +8962,7 @@ export default {
295,
{
"input": [
- 490,
+ 492,
"SendMessageCampaignTestInput!"
]
}
@@ -8928,7 +8971,7 @@ export default {
302,
{
"input": [
- 491,
+ 493,
"CreateUnsubscribeTopicInput!"
]
}
@@ -8937,7 +8980,7 @@ export default {
302,
{
"input": [
- 492,
+ 494,
"UpdateUnsubscribeTopicInput!"
]
}
@@ -8955,7 +8998,7 @@ export default {
285,
{
"input": [
- 493,
+ 495,
"UpdateMessageChannelInput!"
]
}
@@ -8964,7 +9007,7 @@ export default {
293,
{
"input": [
- 495,
+ 497,
"CreateEmailGroupChannelInput!"
]
}
@@ -8973,7 +9016,7 @@ export default {
285,
{
"input": [
- 496,
+ 498,
"UpdateEmailGroupChannelInput!"
]
}
@@ -8991,7 +9034,7 @@ export default {
283,
{
"input": [
- 497,
+ 499,
"CreateEmailingDomainInput!"
]
}
@@ -9027,7 +9070,7 @@ export default {
314,
{
"input": [
- 498,
+ 500,
"RunAgentInput!"
]
}
@@ -9036,7 +9079,7 @@ export default {
311,
{
"input": [
- 501,
+ 503,
"CreateWebhookInput!"
]
}
@@ -9045,7 +9088,7 @@ export default {
311,
{
"input": [
- 502,
+ 504,
"UpdateWebhookInput!"
]
}
@@ -9063,7 +9106,7 @@ export default {
352,
{
"input": [
- 504,
+ 506,
"UpdateMessageFolderInput!"
]
}
@@ -9072,7 +9115,7 @@ export default {
352,
{
"input": [
- 506,
+ 508,
"UpdateMessageFoldersInput!"
]
}
@@ -9081,7 +9124,7 @@ export default {
347,
{
"input": [
- 507,
+ 509,
"UpdateCalendarChannelInput!"
]
}
@@ -9090,7 +9133,7 @@ export default {
345,
{
"input": [
- 509,
+ 511,
"SetAppKeyValueInput!"
]
}
@@ -9111,7 +9154,7 @@ export default {
344,
{
"input": [
- 510,
+ 512,
"EnqueueJobInput!"
]
}
@@ -9141,7 +9184,7 @@ export default {
1
],
"fileAttachments": [
- 511,
+ 513,
"[FileAttachmentInput!]"
]
}
@@ -9170,14 +9213,14 @@ export default {
"UUID!"
],
"answers": [
- 512,
+ 514,
"[AgentChatQuestionAnswerInput!]!"
],
"modelId": [
1
],
"fileAttachments": [
- 511,
+ 513,
"[FileAttachmentInput!]"
]
}
@@ -9255,7 +9298,7 @@ export default {
330,
{
"input": [
- 513,
+ 515,
"CreateSkillInput!"
]
}
@@ -9264,7 +9307,7 @@ export default {
330,
{
"input": [
- 514,
+ 516,
"UpdateSkillInput!"
]
}
@@ -9318,11 +9361,29 @@ export default {
]
}
],
+ "updateTimelineActivityType": [
+ 358,
+ {
+ "input": [
+ 517,
+ "UpdateTimelineActivityTypeInput!"
+ ]
+ }
+ ],
+ "resetTimelineActivityType": [
+ 358,
+ {
+ "id": [
+ 3,
+ "UUID!"
+ ]
+ }
+ ],
"getAuthorizationUrlForSSO": [
258,
{
"input": [
- 515,
+ 518,
"GetAuthorizationUrlForSSOInput!"
]
}
@@ -9488,7 +9549,7 @@ export default {
261,
{
"input": [
- 516
+ 519
]
}
],
@@ -9500,7 +9561,7 @@ export default {
"String!"
],
"file": [
- 387,
+ 389,
"Upload!"
]
}
@@ -9663,7 +9724,7 @@ export default {
8,
{
"input": [
- 517,
+ 520,
"UpdateWorkspaceMemberSettingsInput!"
]
}
@@ -9697,7 +9758,7 @@ export default {
211,
{
"input": [
- 518,
+ 521,
"SetupOIDCSsoInput!"
]
}
@@ -9706,7 +9767,7 @@ export default {
211,
{
"input": [
- 519,
+ 522,
"SetupSAMLSsoInput!"
]
}
@@ -9715,7 +9776,7 @@ export default {
207,
{
"input": [
- 520,
+ 523,
"DeleteSsoInput!"
]
}
@@ -9724,7 +9785,7 @@ export default {
208,
{
"input": [
- 521,
+ 524,
"EditSsoInput!"
]
}
@@ -9753,7 +9814,7 @@ export default {
326,
{
"type": [
- 522,
+ 525,
"AnalyticsType!"
],
"name": [
@@ -9796,7 +9857,7 @@ export default {
316,
{
"input": [
- 523,
+ 526,
"CreateCalendarEventInput!"
]
}
@@ -9805,7 +9866,7 @@ export default {
325,
{
"input": [
- 524,
+ 527,
"SendEmailInput!"
]
}
@@ -9827,7 +9888,7 @@ export default {
"String!"
],
"connectionParameters": [
- 526,
+ 529,
"EmailAccountConnectionParameters!"
],
"id": [
@@ -9839,7 +9900,7 @@ export default {
171,
{
"input": [
- 528,
+ 531,
"UpdateLabPublicFeatureFlagInput!"
]
}
@@ -9904,7 +9965,7 @@ export default {
280,
{
"file": [
- 387,
+ 389,
"Upload!"
],
"applicationUniversalIdentifier": [
@@ -9912,7 +9973,7 @@ export default {
"String!"
],
"fileFolder": [
- 386,
+ 388,
"FileFolder!"
],
"filePath": [
@@ -10026,7 +10087,7 @@ export default {
3
],
"update": [
- 385
+ 387
],
"__typename": [
1
@@ -10137,7 +10198,7 @@ export default {
3
],
"update": [
- 392
+ 394
],
"__typename": [
1
@@ -10308,19 +10369,19 @@ export default {
3
],
"view": [
- 398
+ 400
],
"viewFields": [
- 399
+ 401
],
"viewFilters": [
- 400
+ 402
],
"viewFilterGroups": [
- 401
+ 403
],
"viewSorts": [
- 402
+ 404
],
"__typename": [
1
@@ -10469,7 +10530,7 @@ export default {
3
],
"update": [
- 405
+ 407
],
"__typename": [
1
@@ -10507,7 +10568,7 @@ export default {
3
],
"update": [
- 409
+ 411
],
"__typename": [
1
@@ -10583,7 +10644,7 @@ export default {
3
],
"update": [
- 414
+ 416
],
"__typename": [
1
@@ -10647,10 +10708,10 @@ export default {
3
],
"groups": [
- 419
+ 421
],
"fields": [
- 420
+ 422
],
"__typename": [
1
@@ -10670,7 +10731,7 @@ export default {
8
],
"fields": [
- 420
+ 422
],
"__typename": [
1
@@ -10838,7 +10899,7 @@ export default {
3
],
"tabs": [
- 432
+ 434
],
"__typename": [
1
@@ -10861,7 +10922,7 @@ export default {
82
],
"widgets": [
- 433
+ 435
],
"__typename": [
1
@@ -10884,7 +10945,7 @@ export default {
3
],
"gridPosition": [
- 434
+ 436
],
"position": [
9
@@ -10933,7 +10994,7 @@ export default {
3
],
"gridPosition": [
- 434
+ 436
],
"position": [
9
@@ -10959,7 +11020,7 @@ export default {
3
],
"gridPosition": [
- 434
+ 436
],
"position": [
9
@@ -11052,7 +11113,7 @@ export default {
},
"CreateOneObjectInput": {
"object": [
- 440
+ 442
],
"__typename": [
1
@@ -11112,7 +11173,7 @@ export default {
},
"UpdateOneObjectInput": {
"update": [
- 443
+ 445
],
"id": [
3
@@ -11165,7 +11226,7 @@ export default {
24
],
"translations": [
- 444
+ 446
],
"__typename": [
1
@@ -11187,7 +11248,7 @@ export default {
},
"CreateOneIndexInput": {
"index": [
- 446
+ 448
],
"__typename": [
1
@@ -11198,7 +11259,7 @@ export default {
3
],
"fields": [
- 447
+ 449
],
"indexType": [
233
@@ -11283,7 +11344,7 @@ export default {
3
],
"update": [
- 452
+ 454
],
"__typename": [
1
@@ -11443,7 +11504,7 @@ export default {
3
],
"update": [
- 457
+ 459
],
"__typename": [
1
@@ -11570,7 +11631,7 @@ export default {
1
],
"update": [
- 462
+ 464
],
"__typename": [
1
@@ -11624,7 +11685,7 @@ export default {
1
],
"update": [
- 465
+ 467
],
"__typename": [
1
@@ -11654,7 +11715,7 @@ export default {
},
"CreateOneFieldMetadataInput": {
"field": [
- 468
+ 470
],
"__typename": [
1
@@ -11727,7 +11788,7 @@ export default {
3
],
"update": [
- 470
+ 472
],
"__typename": [
1
@@ -11786,7 +11847,7 @@ export default {
9
],
"translations": [
- 444
+ 446
],
"__typename": [
1
@@ -11825,7 +11886,7 @@ export default {
3
],
"update": [
- 474
+ 476
],
"__typename": [
1
@@ -11910,7 +11971,7 @@ export default {
},
"UpdateRoleInput": {
"update": [
- 479
+ 481
],
"id": [
3
@@ -11965,7 +12026,7 @@ export default {
3
],
"objectPermissions": [
- 481
+ 483
],
"__typename": [
1
@@ -12007,7 +12068,7 @@ export default {
3
],
"fieldPermissions": [
- 484
+ 486
],
"__typename": [
1
@@ -12038,10 +12099,10 @@ export default {
3
],
"predicates": [
- 486
+ 488
],
"predicateGroups": [
- 487
+ 489
],
"__typename": [
1
@@ -12195,7 +12256,7 @@ export default {
3
],
"update": [
- 494
+ 496
],
"__typename": [
1
@@ -12268,7 +12329,7 @@ export default {
3
],
"messages": [
- 499
+ 501
],
"__typename": [
1
@@ -12276,7 +12337,7 @@ export default {
},
"RunAgentMessageInput": {
"role": [
- 500
+ 502
],
"content": [
1
@@ -12311,7 +12372,7 @@ export default {
3
],
"update": [
- 503
+ 505
],
"__typename": [
1
@@ -12339,7 +12400,7 @@ export default {
3
],
"update": [
- 505
+ 507
],
"__typename": [
1
@@ -12358,7 +12419,7 @@ export default {
3
],
"update": [
- 505
+ 507
],
"__typename": [
1
@@ -12369,7 +12430,7 @@ export default {
3
],
"update": [
- 508
+ 510
],
"__typename": [
1
@@ -12497,6 +12558,26 @@ export default {
1
]
},
+ "UpdateTimelineActivityTypeInput": {
+ "id": [
+ 3
+ ],
+ "label": [
+ 1
+ ],
+ "icon": [
+ 1
+ ],
+ "isActive": [
+ 8
+ ],
+ "translations": [
+ 446
+ ],
+ "__typename": [
+ 1
+ ]
+ },
"GetAuthorizationUrlForSSOInput": {
"identityProviderId": [
3
@@ -12654,7 +12735,7 @@ export default {
1
],
"files": [
- 525
+ 528
],
"__typename": [
1
@@ -12676,13 +12757,13 @@ export default {
1
],
"IMAP": [
- 527
+ 530
],
"SMTP": [
- 527
+ 530
],
"CALDAV": [
- 527
+ 530
],
"__typename": [
1
@@ -12733,7 +12814,7 @@ export default {
246,
{
"input": [
- 530,
+ 533,
"LogicFunctionLogsInput!"
]
}
@@ -12751,7 +12832,7 @@ export default {
327,
{
"table": [
- 372,
+ 374,
"EventLogTable!"
]
}
diff --git a/packages/twenty-docs/developers/extend/apps/data/overview.mdx b/packages/twenty-docs/developers/extend/apps/data/overview.mdx
index 381182e0438..fd57f8535b8 100644
--- a/packages/twenty-docs/developers/extend/apps/data/overview.mdx
+++ b/packages/twenty-docs/developers/extend/apps/data/overview.mdx
@@ -35,6 +35,9 @@ A Twenty app's **data layer** is the data your app *adds* to a workspace — the
<Card title="Relations" icon="diagram-project" href="/developers/extend/apps/data/relations">
Bidirectional `MANY_TO_ONE` / `ONE_TO_MANY` connections between objects.
</Card>
+ <Card title="Timeline Activity Types" icon="clock-rotate-left" href="/developers/extend/apps/data/timeline-activity-types">
+ Define automatic audit events and explicit app events for record timelines.
+ </Card>
</CardGroup>
## Entities at a glance
@@ -45,8 +48,9 @@ A Twenty app's **data layer** is the data your app *adds* to a workspace — the
| **Field** | A column on an object. Standalone fields can extend objects you didn't create (e.g. add `loyaltyTier` to Company) | `defineField()` |
| **Relation** | A bidirectional link between two objects — both sides declared as fields | `defineField()` with `FieldType.RELATION` |
| **Index** | A database index to speed up a recurring query on one of your objects | `defineIndex()` |
+| **Timeline activity type** | An automatic audit event or explicit domain event shown in record timelines | `defineTimelineActivityType()` |
-The SDK detects these via AST analysis at build time, so file organization is up to you — the convention is `src/objects/`, `src/fields/`, and `src/indexes/`. Stable `universalIdentifier` UUIDs tie everything together across deploys.
+The SDK detects these via AST analysis at build time, so file organization is up to you — the convention is `src/objects/`, `src/fields/`, `src/indexes/`, and `src/timeline-activity-types/`. Stable `universalIdentifier` UUIDs tie everything together across deploys.
## Indexes (optional)
diff --git a/packages/twenty-docs/developers/extend/apps/data/relations.mdx b/packages/twenty-docs/developers/extend/apps/data/relations.mdx
index cbe004e9e0c..90332677b34 100644
--- a/packages/twenty-docs/developers/extend/apps/data/relations.mdx
+++ b/packages/twenty-docs/developers/extend/apps/data/relations.mdx
@@ -84,6 +84,29 @@ export default defineField({
**Circular imports:** both relation fields reference each other's `universalIdentifier`. To avoid circular import issues, export your field IDs as named constants from each file and import them in the other. The build system resolves these at compile time.
</Note>
+## Junction relations
+
+A junction object connects one source record to one or more target records. For example, `PostCardRecipient` can hold both a `postCard` relation and a `recipient` relation. On the source object's `ONE_TO_MANY` field, set `junctionTargetFieldUniversalIdentifier` to the relation field on the junction object that points to the target:
+
+```ts
+export default defineField({
+ universalIdentifier: POST_CARD_RECIPIENTS_FIELD_ID,
+ objectUniversalIdentifier: POST_CARD_UNIVERSAL_IDENTIFIER,
+ type: FieldType.RELATION,
+ name: 'postCardRecipients',
+ label: 'Post Card Recipients',
+ relationTargetObjectMetadataUniversalIdentifier:
+ POST_CARD_RECIPIENT_UNIVERSAL_IDENTIFIER,
+ relationTargetFieldMetadataUniversalIdentifier: POST_CARD_FIELD_ID,
+ universalSettings: {
+ relationType: RelationType.ONE_TO_MANY,
+ junctionTargetFieldUniversalIdentifier: RECIPIENT_FIELD_ID,
+ },
+});
+```
+
+`RECIPIENT_FIELD_ID` must identify a `MANY_TO_ONE` or morph relation on the junction object. It tells Twenty which related record is the target when a feature such as [timeline activity fan-out](/developers/extend/apps/data/timeline-activity-types#automatic-and-explicit-events) traverses the junction.
+
## Relating to standard objects
To create a relation with a built-in Twenty object (Person, Company, etc.), use `STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS`:
@@ -130,6 +153,7 @@ export default defineField({
| `universalSettings.relationType` | Yes | `RelationType.MANY_TO_ONE` or `RelationType.ONE_TO_MANY` |
| `universalSettings.onDelete` | MANY_TO_ONE only | What happens when the referenced record is deleted: `CASCADE`, `SET_NULL`, `RESTRICT`, or `NO_ACTION` |
| `universalSettings.joinColumnName` | MANY_TO_ONE only | Database column name for the foreign key (e.g., `postCardId`) |
+| `universalSettings.junctionTargetFieldUniversalIdentifier` | Junction ONE_TO_MANY only | Relation field on the junction object that points to the fan-out target |
## Inline relation fields
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.mdx
new file mode 100644
index 00000000000..4b2fef61748
--- /dev/null
+++ b/packages/twenty-docs/developers/extend/apps/data/timeline-activity-types.mdx
@@ -0,0 +1,180 @@
+---
+title: Timeline Activity Types
+description: Define automatic audit events and explicit app events that render in record timelines.
+icon: 'clock-rotate-left'
+---
+
+A timeline activity type defines the stable vocabulary for an event shown in a record's timeline. Standard objects and app objects use the same contract: a type has a label and icon, can optionally declare when it is emitted, and can optionally render through one of your app's [front components](/developers/extend/apps/layout/front-components).
+
+<Note>
+ Timeline activity types are in beta and are coming soon in Twenty 2.34. The
+ API can evolve while we learn from app developers' use cases.
+</Note>
+
+Create one with the scaffolder:
+
+```bash filename="Terminal"
+yarn twenty dev:add timelineActivityType
+```
+
+Or define it directly:
+
+```ts filename="src/timeline-activity-types/post-card-created.ts"
+import { defineTimelineActivityType } from 'twenty-sdk/define';
+
+import { POST_CARD_UNIVERSAL_IDENTIFIER } from '../objects/post-card.object';
+
+export default defineTimelineActivityType({
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7500',
+ name: 'postCardCreated',
+ label: 'created a post card',
+ icon: 'IconMail',
+ emit: {
+ on: 'created',
+ objectUniversalIdentifier: POST_CARD_UNIVERSAL_IDENTIFIER,
+ },
+});
+```
+
+## Automatic and explicit events
+
+Add `emit` when Twenty should create this type automatically. `emit.on` supports `created`, `updated`, `deleted`, `restored`, `linked`, and `unlinked`, while `emit.objectUniversalIdentifier` identifies the source object. Only one effective type can handle the same emit key—`on`, object, and optional through relation—in a workspace.
+
+Without `emit.through`, the event is written on the source record's own timeline. To fan it out to related records, set `emit.through.relationFieldUniversalIdentifier` to a [one-to-many junction relation](/developers/extend/apps/data/relations#junction-relations) on the source object. Its `universalSettings.junctionTargetFieldUniversalIdentifier` must identify the relation from the junction object to the target. Creating or deleting a junction row then produces `linked` or `unlinked`, while changes to the source record produce its normal action on every related target timeline.
+
+`linked` and `unlinked` events require `emit.through`, because their trigger is the creation or deletion of the junction row.
+
+For example, this is the same generic contract used by notes, tasks, messages, and calendar events:
+
+```ts filename="src/timeline-activity-types/post-card-linked.ts"
+import { defineTimelineActivityType } from 'twenty-sdk/define';
+
+import { POST_CARD_RECIPIENTS_FIELD_UNIVERSAL_IDENTIFIER } from '../fields/post-card-recipients-on-post-card.field';
+import { POST_CARD_UNIVERSAL_IDENTIFIER } from '../objects/post-card.object';
+
+export default defineTimelineActivityType({
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7502',
+ name: 'postCardLinked',
+ label: 'received a post card',
+ icon: 'IconMail',
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier: POST_CARD_UNIVERSAL_IDENTIFIER,
+ through: {
+ relationFieldUniversalIdentifier:
+ POST_CARD_RECIPIENTS_FIELD_UNIVERSAL_IDENTIFIER,
+ },
+ },
+});
+```
+
+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.
+
+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"
+import { defineTimelineActivityType } from 'twenty-sdk/define';
+
+export default defineTimelineActivityType({
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7501',
+ name: 'postCardSent',
+ label: 'sent a post card',
+ icon: 'IconSend',
+});
+```
+
+Create explicit events with [`createTimelineActivity()`](/developers/extend/apps/logic/logic-functions#create-a-timeline-activity). App code uses stable universal identifiers; Twenty resolves the installation-specific metadata IDs.
+
+## Custom rendering
+
+Without a front component, Twenty renders a native generic row from the type label, icon, and linked-object metadata. This works for standard and custom objects without an object-specific renderer.
+
+For custom details, set `frontComponentUniversalIdentifier` to a front component owned by the same app:
+
+```ts
+export default defineTimelineActivityType({
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7501',
+ name: 'postCardSent',
+ label: 'sent a post card',
+ icon: 'IconSend',
+ frontComponentUniversalIdentifier: '88c15ae2-5f87-4a6b-b48f-1974bbe62eb7',
+});
+```
+
+The native row remains the collapsed presentation. Twenty mounts the front component only after the user expands that row, avoiding a sandbox and worker for every visible event. Inside the component, call `useTimelineActivityId()` from `twenty-sdk/front-component` to read the row ID and fetch any data your presentation needs. It returns `null` when the component is rendered outside a timeline row.
+
+## Overriding another application's presentation
+
+An app owns automatic timeline contracts for its own objects. To customize an event on an object owned by another app, declare the existing type explicitly with `replacesTimelineActivityTypeUniversalIdentifier`:
+
+```ts
+export default defineTimelineActivityType({
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7503',
+ name: 'companyCreatedWithDeploymentContext',
+ label: 'was created from a deployment',
+ emit: {
+ on: 'created',
+ objectUniversalIdentifier: COMPANY_UNIVERSAL_IDENTIFIER,
+ },
+ replacesTimelineActivityTypeUniversalIdentifier:
+ RECORD_CREATED_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER,
+ frontComponentUniversalIdentifier: '88c15ae2-5f87-4a6b-b48f-1974bbe62eb7',
+});
+```
+
+An override must include `emit`, because it replaces an existing automatic emit slot rather than an explicit-only type. The referenced type must belong to the target object's application and describe the same action and route. Removing the overriding app restores the base type; removing the base type disables the override.
+
+## Workspace overrides and muting
+
+Workspace administrators can change a type's presentation or mute its automatic and explicit events without forking the application. Use the metadata API's `updateTimelineActivityType` mutation with the installation-specific type ID:
+
+```graphql
+mutation CustomizeTimelineActivityType(
+ $id: UUID!
+ $label: String
+ $icon: String
+ $isActive: Boolean
+) {
+ updateTimelineActivityType(
+ input: { id: $id, label: $label, icon: $icon, isActive: $isActive }
+ ) {
+ id
+ label
+ icon
+ isActive
+ }
+}
+```
+
+`label` and `icon` are stored as workspace overrides, so later application updates do not overwrite the administrator's choices. Set `isActive` to `false` to stop automatic emission and reject new explicit events of that type. Existing rows remain visible.
+
+Restore the application defaults, including the active state, with:
+
+```graphql
+mutation ResetTimelineActivityType($id: UUID!) {
+ resetTimelineActivityType(id: $id) {
+ id
+ label
+ icon
+ isActive
+ }
+}
+```
+
+## Configuration fields
+
+| Field | Required | Description |
+| ------------------------------------------------- | --------- | -------------------------------------------------------------------- |
+| `universalIdentifier` | Yes | Stable UUID for the type across installations and upgrades |
+| `name` | Yes | App-local programmatic name |
+| `label` | Yes | User-facing action text used by the native renderer |
+| `icon` | No | Twenty icon name displayed beside the event |
+| `emit` | No | Automatic emission declaration; omit for explicit-only types |
+| `emit.on` | With emit | Audit action that causes this type to be written |
+| `emit.objectUniversalIdentifier` | With emit | Object whose records emit this type |
+| `emit.through.relationFieldUniversalIdentifier` | No | Junction relation used to fan events out to related record timelines |
+| `emit.through.triggerFieldUniversalIdentifiers` | No | Source fields that can trigger an `updated` through event |
+| `frontComponentUniversalIdentifier` | No | App-owned front component mounted when the row is expanded |
+| `replacesTimelineActivityTypeUniversalIdentifier` | No | Existing emit type replaced; requires `emit` |
+
+Twenty snapshots semantic identity and durable presentation fallbacks when an event is created. Historical rows keep their original action and object meaning. While the type is installed, its current translated label, icon, and front component render live; after uninstall, the snapshot fallback keeps the row readable. Resolution uses the universal identifier, so presentation also survives reinstalling the app.
diff --git a/packages/twenty-docs/developers/extend/apps/getting-started/scaffolding.mdx b/packages/twenty-docs/developers/extend/apps/getting-started/scaffolding.mdx
index 810e2866822..68b39bbf0dc 100644
--- a/packages/twenty-docs/developers/extend/apps/getting-started/scaffolding.mdx
+++ b/packages/twenty-docs/developers/extend/apps/getting-started/scaffolding.mdx
@@ -38,6 +38,7 @@ yarn twenty dev:add frontComponent
| Command menu item | `yarn twenty dev:add commandMenuItem` | `src/command-menu-items/<name>.ts` |
| View field | `yarn twenty dev:add viewField` | `src/view-fields/<name>.ts` |
| Connection provider | `yarn twenty dev:add connectionProvider` | `src/connection-providers/<name>.ts` |
+| Timeline activity type | `yarn twenty dev:add timelineActivityType` | `src/timeline-activity-types/<name>.ts` |
## What the scaffolder generates
diff --git a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
index 1ff6febcbe5..d5120fb3a8d 100644
--- a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
+++ b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
@@ -415,6 +415,7 @@ Available hooks:
| `useSelectedRecordIds()` | `string[]` | All selected record IDs (empty array if none selected) |
| `useRecordId()` | `string` or `null` | **Deprecated.** Use `useSelectedRecordIds()` instead |
| `useFrontComponentId()` | `string` | This component instance's ID |
+| `useTimelineActivityId()` | `string` or `null` | The current timeline activity ID when rendering a custom timeline row |
| `useColorScheme()` | `'light'` or `'dark'` | The host UI's active color scheme (`System` is already resolved) |
| `useFrontComponentExecutionContext(selector)` | varies | Access the full execution context with a selector function |
diff --git a/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx b/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
index b5c232f0598..1bb51c453ba 100644
--- a/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
+++ b/packages/twenty-docs/developers/extend/apps/logic/logic-functions.mdx
@@ -713,6 +713,45 @@ const handler = async (params: { parentMessageId?: string }) => {
**Install hooks** — pre-install, post-install, and uninstall handlers — share this runtime but are declared with their own define functions and don't take trigger settings. See [Install Hooks](/developers/extend/apps/config/install-hooks) for `definePreInstallLogicFunction`, `definePostInstallLogicFunction`, and `defineUninstallLogicFunction`.
</Note>
+## Create a timeline activity
+
+Use `createTimelineActivity()` to publish an explicit domain event from a logic function. Define the event first as a [timeline activity type](/developers/extend/apps/data/timeline-activity-types), then address the type and objects by their stable universal identifiers:
+
+```ts
+import { createTimelineActivity } from 'twenty-sdk/logic-function';
+
+await createTimelineActivity({
+ timelineActivityTypeUniversalIdentifier:
+ 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7501',
+ targetObjectUniversalIdentifier: POST_CARD_UNIVERSAL_IDENTIFIER,
+ targetRecordId: postCardId,
+ happensAt: new Date().toISOString(),
+ properties: {
+ deliveryProvider: 'postal-service',
+ },
+});
+```
+
+Twenty resolves universal identifiers to the installation-specific metadata IDs, validates that the timeline activity type belongs to the calling app, and snapshots its presentation metadata on the new activity.
+
+The required inputs are `timelineActivityTypeUniversalIdentifier`, `targetObjectUniversalIdentifier`, and `targetRecordId`. You can also provide `happensAt`, `properties`, and `workspaceMemberId`. `happensAt` controls the event's position and displayed time in the timeline; it defaults to the creation time.
+
+To associate another record with the event, provide `linkedRecordId` and `linkedObjectMetadataUniversalIdentifier` together. You can additionally provide `linkedRecordCachedName` as a historical display fallback:
+
+```ts
+await createTimelineActivity({
+ timelineActivityTypeUniversalIdentifier:
+ 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7501',
+ targetObjectUniversalIdentifier: POST_CARD_UNIVERSAL_IDENTIFIER,
+ targetRecordId: postCardId,
+ linkedObjectMetadataUniversalIdentifier: RECIPIENT_UNIVERSAL_IDENTIFIER,
+ linkedRecordId: recipientId,
+ linkedRecordCachedName: recipientName,
+});
+```
+
+The logic function's role needs write permission on the standard `timelineActivity` object. Keep explicit event types unbound from an `action`; an action-bound type already receives automatic audit events and would otherwise produce duplicate rows.
+
## Typed API clients (twenty-client-sdk)
The `twenty-client-sdk` package provides two typed GraphQL clients for interacting with the Twenty API from your logic functions and front components.
diff --git a/packages/twenty-docs/developers/self-host/capabilities/upgrade-guide.mdx b/packages/twenty-docs/developers/self-host/capabilities/upgrade-guide.mdx
index 4592c601a8b..64aa11664b4 100644
--- a/packages/twenty-docs/developers/self-host/capabilities/upgrade-guide.mdx
+++ b/packages/twenty-docs/developers/self-host/capabilities/upgrade-guide.mdx
@@ -25,6 +25,10 @@ If you use Docker Compose, follow these steps:
The server runs all required upgrade migrations automatically on startup. No manual command is needed.
+## Upgrading to v2.34+ — PostgreSQL 15 minimum
+
+Twenty v2.34 requires PostgreSQL 15 or newer. The official Docker Compose configuration uses PostgreSQL 16. If your instance connects to an externally managed database, upgrade it before starting the v2.34 server.
+
## Cross-version upgrades (v1.23+)
Starting from **v1.23**, Twenty supports cross-version upgrades. You can jump directly from any supported version to the latest release without stepping through each intermediate version.
diff --git a/packages/twenty-docs/docs.json b/packages/twenty-docs/docs.json
index 264968ed4fe..465997000e7 100644
--- a/packages/twenty-docs/docs.json
+++ b/packages/twenty-docs/docs.json
@@ -427,7 +427,8 @@
"developers/extend/apps/data/objects",
"developers/extend/apps/data/extending-objects",
"developers/extend/apps/data/system-fields",
- "developers/extend/apps/data/relations"
+ "developers/extend/apps/data/relations",
+ "developers/extend/apps/data/timeline-activity-types"
]
},
{
diff --git a/packages/twenty-docs/navigation/base-structure.json b/packages/twenty-docs/navigation/base-structure.json
index bb6aa46d6c6..bff899d3e51 100644
--- a/packages/twenty-docs/navigation/base-structure.json
+++ b/packages/twenty-docs/navigation/base-structure.json
@@ -427,7 +427,8 @@
"developers/extend/apps/data/objects",
"developers/extend/apps/data/extending-objects",
"developers/extend/apps/data/system-fields",
- "developers/extend/apps/data/relations"
+ "developers/extend/apps/data/relations",
+ "developers/extend/apps/data/timeline-activity-types"
]
},
{
diff --git a/packages/twenty-front-component-renderer/src/__stories__/FrontComponentRenderer.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/FrontComponentRenderer.stories.tsx
index 3df4351ae39..3bea8de4c37 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/FrontComponentRenderer.stories.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/FrontComponentRenderer.stories.tsx
@@ -20,6 +20,7 @@ const meta: Meta<typeof FrontComponentRenderer> = {
userId: null,
recordId: null,
selectedRecordIds: [],
+ timelineActivityId: null,
colorScheme: 'light',
},
},
@@ -124,6 +125,7 @@ export const SdkContext: Story = {
userId: 'test-user-abc-123',
recordId: null,
selectedRecordIds: [],
+ timelineActivityId: null,
colorScheme: 'light',
},
},
diff --git a/packages/twenty-front-component-renderer/src/__stories__/Geometry.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/Geometry.stories.tsx
index 3ae83d9bf44..ac98de1635b 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/Geometry.stories.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/Geometry.stories.tsx
@@ -22,6 +22,7 @@ const meta: Meta<typeof FrontComponentRenderer> = {
userId: null,
recordId: null,
selectedRecordIds: [],
+ timelineActivityId: null,
colorScheme: 'light',
},
},
diff --git a/packages/twenty-front-component-renderer/src/__stories__/UILibraries.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/UILibraries.stories.tsx
index f49aa4b858f..171c6204e18 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/UILibraries.stories.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/UILibraries.stories.tsx
@@ -20,6 +20,7 @@ const meta: Meta<typeof FrontComponentRenderer> = {
userId: null,
recordId: null,
selectedRecordIds: [],
+ timelineActivityId: null,
colorScheme: 'light',
},
},
diff --git a/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/createFrontComponentStoryMeta.ts b/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/createFrontComponentStoryMeta.ts
index dc69a01269c..e00ce5523d5 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/createFrontComponentStoryMeta.ts
+++ b/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/createFrontComponentStoryMeta.ts
@@ -34,6 +34,7 @@ export const FRONT_COMPONENT_STORY_DEFAULT_ARGS: NonNullable<
userId: null,
recordId: null,
selectedRecordIds: [],
+ timelineActivityId: null,
colorScheme: 'light',
},
colorScheme: 'light',
diff --git a/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/runFrontComponentStory.ts b/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/runFrontComponentStory.ts
index cb1447db624..72cae9ca9c6 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/runFrontComponentStory.ts
+++ b/packages/twenty-front-component-renderer/src/__stories__/shared/test-utils/runFrontComponentStory.ts
@@ -23,6 +23,7 @@ export const runFrontComponentStory = ({
userId: null,
recordId: null,
selectedRecordIds: [],
+ timelineActivityId: null,
colorScheme: 'light',
},
},
diff --git a/packages/twenty-front-component-renderer/src/types/FrontComponentExecutionContext.ts b/packages/twenty-front-component-renderer/src/types/FrontComponentExecutionContext.ts
index 660956c839c..9515c8883f2 100644
--- a/packages/twenty-front-component-renderer/src/types/FrontComponentExecutionContext.ts
+++ b/packages/twenty-front-component-renderer/src/types/FrontComponentExecutionContext.ts
@@ -9,6 +9,7 @@ export type FrontComponentExecutionContext = {
recordId: string | null;
/** All selected record IDs */
selectedRecordIds: string[];
+ timelineActivityId: string | null;
/** Resolved color scheme of the host UI ('System' is already resolved) */
colorScheme: 'light' | 'dark';
locale?: AppLocale;
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 0b6830f1be8..7d7be8761b6 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -2776,6 +2776,7 @@ export type Mutation = {
resetPageLayoutTabToDefault: PageLayoutTab;
resetPageLayoutToDefault: PageLayout;
resetPageLayoutWidgetToDefault: PageLayoutWidget;
+ resetTimelineActivityType: TimelineActivityType;
retryChatMessage: SendChatMessageResult;
revokeAllOtherUserSessions: Scalars['Int']['output'];
revokeApiKey?: Maybe<ApiKey>;
@@ -2840,6 +2841,7 @@ export type Mutation = {
updatePageLayoutWithTabsAndWidgets: PageLayout;
updatePasswordViaResetToken: InvalidatePassword;
updateSkill: Skill;
+ updateTimelineActivityType: TimelineActivityType;
updateUnsubscribeTopic: UnsubscribeTopic;
updateUserEmail: Scalars['Boolean']['output'];
updateView: View;
@@ -3554,6 +3556,11 @@ export type MutationResetPageLayoutWidgetToDefaultArgs = {
};
+export type MutationResetTimelineActivityTypeArgs = {
+ id: Scalars['UUID']['input'];
+};
+
+
export type MutationRetryChatMessageArgs = {
modelId?: InputMaybe<Scalars['String']['input']>;
threadId: Scalars['UUID']['input'];
@@ -3889,6 +3896,11 @@ export type MutationUpdateSkillArgs = {
};
+export type MutationUpdateTimelineActivityTypeArgs = {
+ input: UpdateTimelineActivityTypeInput;
+};
+
+
export type MutationUpdateUnsubscribeTopicArgs = {
input: UpdateUnsubscribeTopicInput;
};
@@ -4203,6 +4215,7 @@ export type ObjectFilter = {
isUIEditable?: InputMaybe<BooleanFieldComparison>;
isUIReadOnly?: InputMaybe<BooleanFieldComparison>;
or?: InputMaybe<Array<ObjectFilter>>;
+ universalIdentifier?: InputMaybe<UuidFilterComparison>;
};
export type ObjectIndexMetadatasConnection = {
@@ -5586,18 +5599,39 @@ export type TasksConfiguration = {
export type TimelineActivityType = {
__typename?: 'TimelineActivityType';
+ /** @deprecated Use emit.on */
action?: Maybe<Scalars['String']['output']>;
applicationId?: Maybe<Scalars['UUID']['output']>;
createdAt: Scalars['DateTime']['output'];
+ emit?: Maybe<TimelineActivityTypeEmit>;
+ frontComponentUniversalIdentifier?: Maybe<Scalars['UUID']['output']>;
icon?: Maybe<Scalars['String']['output']>;
id: Scalars['UUID']['output'];
+ isActive: Scalars['Boolean']['output'];
label: Scalars['String']['output'];
name: Scalars['String']['output'];
+ /** @deprecated Use emit.objectUniversalIdentifier */
objectUniversalIdentifier?: Maybe<Scalars['UUID']['output']>;
+ /** @deprecated Use frontComponentUniversalIdentifier */
renderer?: Maybe<Scalars['String']['output']>;
+ replacesTimelineActivityTypeUniversalIdentifier?: Maybe<Scalars['UUID']['output']>;
+ universalIdentifier: Scalars['UUID']['output'];
updatedAt: Scalars['DateTime']['output'];
};
+export type TimelineActivityTypeEmit = {
+ __typename?: 'TimelineActivityTypeEmit';
+ objectUniversalIdentifier?: Maybe<Scalars['UUID']['output']>;
+ on: Scalars['String']['output'];
+ through?: Maybe<TimelineActivityTypeEmitThrough>;
+};
+
+export type TimelineActivityTypeEmitThrough = {
+ __typename?: 'TimelineActivityTypeEmitThrough';
+ relationFieldUniversalIdentifier: Scalars['UUID']['output'];
+ triggerFieldUniversalIdentifiers?: Maybe<Array<Scalars['UUID']['output']>>;
+};
+
export type TimelineConfiguration = {
__typename?: 'TimelineConfiguration';
configurationType: WidgetConfigurationType;
@@ -5960,6 +5994,14 @@ export type UpdateSkillInput = {
name?: InputMaybe<Scalars['String']['input']>;
};
+export type UpdateTimelineActivityTypeInput = {
+ icon?: InputMaybe<Scalars['String']['input']>;
+ id: Scalars['UUID']['input'];
+ isActive?: InputMaybe<Scalars['Boolean']['input']>;
+ label?: InputMaybe<Scalars['String']['input']>;
+ translations?: InputMaybe<Array<MetadataTranslationOverrideInput>>;
+};
+
export type UpdateUnsubscribeTopicInput = {
description?: InputMaybe<Scalars['String']['input']>;
id: Scalars['String']['input'];
@@ -6895,7 +6937,7 @@ export type SendMessageCampaignTestMutation = { __typename?: 'Mutation', sendMes
export type FindManyTimelineActivityTypesQueryVariables = Exact<{ [key: string]: never; }>;
-export type FindManyTimelineActivityTypesQuery = { __typename?: 'Query', timelineActivityTypes: Array<{ __typename?: 'TimelineActivityType', id: string, name: string, label: string, action?: string | null, icon?: string | null, renderer?: string | null, objectUniversalIdentifier?: string | null }> };
+export type FindManyTimelineActivityTypesQuery = { __typename?: 'Query', timelineActivityTypes: Array<{ __typename?: 'TimelineActivityType', id: string, universalIdentifier: string, name: string, label: string, icon?: string | null, frontComponentUniversalIdentifier?: string | null, isActive: boolean, emit?: { __typename?: 'TimelineActivityTypeEmit', on: string, objectUniversalIdentifier?: string | null } | null }> };
export type AgentFieldsFragment = { __typename?: 'Agent', id: string, name: string, label: string, description?: string | null, icon?: string | null, prompt: string, modelId: string, responseFormat?: any | null, roleId?: string | null, isCustom: boolean, modelConfiguration?: any | null, evaluationInputs: Array<string>, applicationId?: string | null, createdAt: string, updatedAt: string };
@@ -9512,7 +9554,7 @@ export const UnsubscribeTopicsDocument = {"kind":"Document","definitions":[{"kin
export const SendEmailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendEmail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendEmailInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendEmail"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"messageThreadId"}}]}}]}}]} as unknown as DocumentNode<SendEmailMutation, SendEmailMutationVariables>;
export const SendMessageCampaignDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendMessageCampaign"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendMessageCampaignInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendMessageCampaign"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"campaignId"}},{"kind":"Field","name":{"kind":"Name","value":"queuedCount"}},{"kind":"Field","name":{"kind":"Name","value":"skipped"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"noEmail"}},{"kind":"Field","name":{"kind":"Name","value":"deduped"}},{"kind":"Field","name":{"kind":"Name","value":"overCap"}}]}}]}}]}}]} as unknown as DocumentNode<SendMessageCampaignMutation, SendMessageCampaignMutationVariables>;
export const SendMessageCampaignTestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendMessageCampaignTest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendMessageCampaignTestInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendMessageCampaignTest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"messageId"}}]}}]}}]} as unknown as DocumentNode<SendMessageCampaignTestMutation, SendMessageCampaignTestMutationVariables>;
-export const FindManyTimelineActivityTypesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindManyTimelineActivityTypes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timelineActivityTypes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"action"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"renderer"}},{"kind":"Field","name":{"kind":"Name","value":"objectUniversalIdentifier"}}]}}]}}]} as unknown as DocumentNode<FindManyTimelineActivityTypesQuery, FindManyTimelineActivityTypesQueryVariables>;
+export const FindManyTimelineActivityTypesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindManyTimelineActivityTypes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"timelineActivityTypes"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"emit"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"on"}},{"kind":"Field","name":{"kind":"Name","value":"objectUniversalIdentifier"}}]}},{"kind":"Field","name":{"kind":"Name","value":"frontComponentUniversalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}}]}}]}}]} as unknown as DocumentNode<FindManyTimelineActivityTypesQuery, FindManyTimelineActivityTypesQueryVariables>;
export const ActivateSkillDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ActivateSkill"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activateSkill"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SkillFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SkillFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Skill"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"content"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<ActivateSkillMutation, ActivateSkillMutationVariables>;
export const AnswerAgentChatQuestionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AnswerAgentChatQuestion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"answers"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AgentChatQuestionAnswerInput"}}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"fileAttachments"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"FileAttachmentInput"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"answerAgentChatQuestion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}},{"kind":"Argument","name":{"kind":"Name","value":"messageId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}}},{"kind":"Argument","name":{"kind":"Name","value":"answers"},"value":{"kind":"Variable","name":{"kind":"Name","value":"answers"}}},{"kind":"Argument","name":{"kind":"Name","value":"modelId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}}},{"kind":"Argument","name":{"kind":"Name","value":"fileAttachments"},"value":{"kind":"Variable","name":{"kind":"Name","value":"fileAttachments"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"messageId"}},{"kind":"Field","name":{"kind":"Name","value":"queued"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}}]}}]}}]} as unknown as DocumentNode<AnswerAgentChatQuestionMutation, AnswerAgentChatQuestionMutationVariables>;
export const ArchiveChatThreadDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ArchiveChatThread"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"archiveChatThread"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<ArchiveChatThreadMutation, ArchiveChatThreadMutationVariables>;
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx
index b1d7c54b516..fd5e874b834 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessage.tsx
@@ -7,9 +7,8 @@ import { EmailThreadMessageReceivers } from '@/activities/emails/components/Emai
import { EmailThreadMessageSender } from '@/activities/emails/components/EmailThreadMessageSender';
import { EmailThreadNotShared } from '@/activities/emails/components/EmailThreadNotShared';
import { type EmailThreadMessageWithSender } from '@/activities/emails/types/EmailThreadMessageWithSender';
-import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
import { MessageParticipantRole } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
+import { isDefined, isFieldValueRestricted } from 'twenty-shared/utils';
import { MessageChannelVisibility } from '~/generated/graphql';
type EmailThreadMessageProps = {
@@ -40,8 +39,7 @@ export const EmailThreadMessage = ({
const { isDraft } = message;
- const isRestricted =
- message.text === FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED;
+ const isRestricted = isFieldValueRestricted(message.text);
const handleRowClick = () => {
if (isRestricted) {
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx
index 87c35a1da9c..8ff9dfd4fdb 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx
@@ -4,7 +4,7 @@ import { type ReactElement } from 'react';
import { EventsGroup } from '@/activities/timeline-activities/components/EventsGroup';
import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
import { useTimelineActivityTypes } from '@/activities/timeline-activities/hooks/useTimelineActivityTypes';
-import { timelineActivityTypeIdsFilterFamilyState } from '@/activities/timeline-activities/states/timelineActivityTypeIdsFilterFamilyState';
+import { timelineActivityTypeUniversalIdentifiersFilterFamilyState } from '@/activities/timeline-activities/states/timelineActivityTypeUniversalIdentifiersFilterFamilyState';
import { filterOutInvalidTimelineActivities } from '@/activities/timeline-activities/utils/filterOutInvalidTimelineActivities';
import { keepTimelineActivitiesOfSelectedTypes } from '@/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes';
import { groupEventsByMonth } from '@/activities/timeline-activities/utils/groupEventsByMonth';
@@ -49,21 +49,23 @@ export const EventList = ({ events, targetableObject }: EventListProps) => {
const { objectMetadataItems } = useObjectMetadataItems();
- const { timelineActivityTypeById } = useTimelineActivityTypes();
+ const { timelineActivityTypeMaps } = useTimelineActivityTypes();
- const timelineActivityTypeIdsFilter = useAtomFamilyStateValue(
- timelineActivityTypeIdsFilterFamilyState,
- targetableObject.id,
- );
+ const timelineActivityTypeUniversalIdentifiersFilter =
+ useAtomFamilyStateValue(
+ timelineActivityTypeUniversalIdentifiersFilterFamilyState,
+ targetableObject.id,
+ );
const filteredEvents = filterOutInvalidTimelineActivities(
keepTimelineActivitiesOfSelectedTypes(
events,
- timelineActivityTypeIdsFilter,
+ timelineActivityTypeUniversalIdentifiersFilter,
+ timelineActivityTypeMaps,
),
targetableObject.targetObjectNameSingular,
objectMetadataItems,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
);
const groupedEvents = groupEventsByMonth(filteredEvents);
@@ -93,7 +95,7 @@ export const EventList = ({ events, targetableObject }: EventListProps) => {
mainObjectMetadataItem={mainObjectMetadataItem}
key={group.year.toString() + group.month}
group={group}
- month={new Date(group.items[0].createdAt).toLocaleString(
+ month={new Date(group.items[0].happensAt).toLocaleString(
'default',
{ month: 'long' },
)}
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx
index 6bbeba2be64..0ced1588347 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx
@@ -6,6 +6,8 @@ import { TimelineActivityContext } from '@/activities/timeline-activities/contex
import { EventIconDynamicComponent } from '@/activities/timeline-activities/rows/components/EventIconDynamicComponent';
import { EventRowDynamicComponent } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent';
+import { getStandardTimelineActivityRenderer } from '@/activities/timeline-activities/rows/components/StandardTimelineActivityRenderer';
+import { type TimelineActivityRenderer } from '@/activities/timeline-activities/rows/components/TimelineActivityRenderer';
import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
import { useTimelineActivityTypes } from '@/activities/timeline-activities/hooks/useTimelineActivityTypes';
import { getTimelineActivityAction } from '@/activities/timeline-activities/utils/getTimelineActivityAction';
@@ -21,6 +23,8 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
import { allowRequestsToTwentyIconsState } from '@/client-config/states/allowRequestsToTwentyIcons';
+import { frontComponentsSelector } from '@/front-components/states/frontComponentsSelector';
+import { isDefined } from 'twenty-shared/utils';
const StyledTimelineItemContainer = styled.div`
color: ${themeCssVariables.font.color.primary};
@@ -64,10 +68,6 @@ const StyledVerticalLine = styled.div`
width: 2px;
`;
-const StyledSummary = styled.summary`
- width: 100%;
-`;
-
const StyledItemContainer = styled.div<{ isMarginBottom?: boolean }>`
align-items: flex-start;
display: flex;
@@ -86,6 +86,24 @@ type EventRowProps = {
event: TimelineActivity;
};
+const getTimelineActivityRenderer = ({
+ standardRenderer,
+ frontComponentId,
+}: {
+ standardRenderer: ReturnType<typeof getStandardTimelineActivityRenderer>;
+ frontComponentId: string | null;
+}): TimelineActivityRenderer | null => {
+ if (isDefined(standardRenderer)) {
+ return { type: 'standard', Component: standardRenderer };
+ }
+
+ if (isDefined(frontComponentId)) {
+ return { type: 'frontComponent', frontComponentId };
+ }
+
+ return null;
+};
+
export const EventRow = ({
isLastEvent,
event,
@@ -101,24 +119,41 @@ export const EventRow = ({
const recordStore = useAtomFamilyStateValue(recordStoreFamilyState, recordId);
- const { timelineActivityTypeById } = useTimelineActivityTypes();
+ const { timelineActivityTypeMaps } = useTimelineActivityTypes();
+ const frontComponents = useAtomStateValue(frontComponentsSelector);
const { objectMetadataItems } = useObjectMetadataItems();
const timelineActivityType = getTimelineActivityType(
event,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
);
+ const rendererUniversalIdentifier =
+ timelineActivityType?.frontComponentUniversalIdentifier;
+ const standardRenderer = getStandardTimelineActivityRenderer(
+ rendererUniversalIdentifier,
+ );
+ const frontComponentId = isDefined(rendererUniversalIdentifier)
+ ? (frontComponents.find(
+ (frontComponent) =>
+ frontComponent.universalIdentifier === rendererUniversalIdentifier,
+ )?.id ?? null)
+ : null;
+ const renderer = getTimelineActivityRenderer({
+ standardRenderer,
+ frontComponentId,
+ });
+
const timelineActivityAction = getTimelineActivityAction(
event,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
);
const linkedObjectMetadataItem =
getTimelineActivityLinkedObjectMetadataItem({
timelineActivity: event,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
objectMetadataItems,
}) ?? null;
@@ -144,10 +179,6 @@ export const EventRow = ({
currentWorkspaceMember,
);
- if (isUndefinedOrNull(mainObjectMetadataItem)) {
- throw new Error('mainObjectMetadataItem is required');
- }
-
return (
<>
<StyledTimelineItemContainer>
@@ -165,18 +196,17 @@ export const EventRow = ({
)}
</StyledLeftContainer>
<StyledItemContainer isMarginBottom={!isLastEvent}>
- <StyledSummary>
- <EventRowDynamicComponent
- authorFullName={authorFullName}
- labelIdentifierValue={labelIdentifier.name}
- event={event}
- eventAction={timelineActivityAction}
- eventRenderer={timelineActivityType?.renderer ?? null}
- mainObjectMetadataItem={mainObjectMetadataItem}
- linkedObjectMetadataItem={linkedObjectMetadataItem}
- createdAt={event.createdAt}
- />
- </StyledSummary>
+ <EventRowDynamicComponent
+ authorFullName={authorFullName}
+ labelIdentifierValue={labelIdentifier.name}
+ event={event}
+ eventAction={timelineActivityAction}
+ eventTypeLabel={timelineActivityType?.label}
+ renderer={renderer}
+ mainObjectMetadataItem={mainObjectMetadataItem}
+ linkedObjectMetadataItem={linkedObjectMetadataItem}
+ happensAt={event.happensAt}
+ />
</StyledItemContainer>
</StyledTimelineItemContainer>
</>
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
index 0544aa6b829..67a07b0561c 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx
@@ -4,6 +4,7 @@ import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomRes
import { SkeletonLoader } from '@/activities/components/SkeletonLoader';
import { EventList } from '@/activities/timeline-activities/components/EventList';
import { useTimelineActivities } from '@/activities/timeline-activities/hooks/useTimelineActivities';
+import { RecordListUpsertRecordsInStoreEffect } from '@/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect';
import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { t } from '@lingui/core/macro';
@@ -52,6 +53,7 @@ export const TimelineCard = () => {
firstQueryLoading,
loadingMore,
fetchMoreRecords,
+ linkedRecords,
} = useTimelineActivities(targetRecord);
const isTimelineActivitiesEmpty = timelineActivities.length === 0;
@@ -85,16 +87,19 @@ export const TimelineCard = () => {
}
return (
- <StyledMainContainer>
- <EventList
- targetableObject={targetRecord}
- title={t`All`}
- events={timelineActivities ?? []}
- />
- <CustomResolverFetchMoreLoader
- loading={loadingMore}
- onLastRowVisible={fetchMoreRecords}
- />
- </StyledMainContainer>
+ <>
+ <RecordListUpsertRecordsInStoreEffect records={linkedRecords} />
+ <StyledMainContainer>
+ <EventList
+ targetableObject={targetRecord}
+ title={t`All`}
+ events={timelineActivities ?? []}
+ />
+ <CustomResolverFetchMoreLoader
+ loading={loadingMore}
+ onLastRowVisible={fetchMoreRecords}
+ />
+ </StyledMainContainer>
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/constants/TimelineActivityRowComponentByRenderer.ts b/packages/twenty-front/src/modules/activities/timeline-activities/constants/TimelineActivityRowComponentByRenderer.ts
deleted file mode 100644
index 6d3a1e5cf28..00000000000
--- a/packages/twenty-front/src/modules/activities/timeline-activities/constants/TimelineActivityRowComponentByRenderer.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { EventRowActivity } from '@/activities/timeline-activities/rows/activity/components/EventRowActivity';
-import { EventRowCalendarEvent } from '@/activities/timeline-activities/rows/calendar/components/EventRowCalendarEvent';
-import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
-import { EventRowGenericLinked } from '@/activities/timeline-activities/rows/generic/components/EventRowGenericLinked';
-import { EventRowMainObject } from '@/activities/timeline-activities/rows/main-object/components/EventRowMainObject';
-import { EventRowMessage } from '@/activities/timeline-activities/rows/message/components/EventRowMessage';
-import { type ComponentType } from 'react';
-import { type TimelineActivityRenderer } from 'twenty-shared/timeline';
-
-// The one place a renderer name becomes a component. A timeline activity type
-// names its renderer, so adding a row shape is adding an entry here and a type
-// declaring it, never a new branch at the call site.
-export const TIMELINE_ACTIVITY_ROW_COMPONENT_BY_RENDERER: Record<
- TimelineActivityRenderer,
- ComponentType<EventRowDynamicComponentProps>
-> = {
- mainObject: EventRowMainObject,
- genericLinked: EventRowGenericLinked,
- activity: EventRowActivity,
- message: EventRowMessage,
- calendarEvent: EventRowCalendarEvent,
-};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/graphql/queries/findManyTimelineActivityTypes.ts b/packages/twenty-front/src/modules/activities/timeline-activities/graphql/queries/findManyTimelineActivityTypes.ts
index 768db6e1808..a6eb5ba1518 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/graphql/queries/findManyTimelineActivityTypes.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/graphql/queries/findManyTimelineActivityTypes.ts
@@ -4,12 +4,16 @@ export const FIND_MANY_TIMELINE_ACTIVITY_TYPES = gql`
query FindManyTimelineActivityTypes {
timelineActivityTypes {
id
+ universalIdentifier
name
label
- action
icon
- renderer
- objectUniversalIdentifier
+ emit {
+ on
+ objectUniversalIdentifier
+ }
+ frontComponentUniversalIdentifier
+ isActive
}
}
`;
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/__tests__/useLinkedRecordsIdentifiers.test.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/__tests__/useLinkedRecordsIdentifiers.test.tsx
new file mode 100644
index 00000000000..84ba2aabc9b
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/__tests__/useLinkedRecordsIdentifiers.test.tsx
@@ -0,0 +1,45 @@
+import { renderHook } from '@testing-library/react';
+
+import { useLinkedRecordsIdentifiers } from '@/activities/timeline-activities/hooks/useLinkedRecordsIdentifiers';
+import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+
+const linkedRecordsResult = {
+ notes: [{ id: 'note-id', __typename: 'Note', title: 'Quarterly plan' }],
+};
+
+jest.mock(
+ '@/object-record/multiple-objects/hooks/useCombinedFindManyRecords',
+ () => ({
+ useCombinedFindManyRecords: () => ({
+ loading: false,
+ result: linkedRecordsResult,
+ }),
+ }),
+);
+
+describe('useLinkedRecordsIdentifiers', () => {
+ it('returns fetched identifiers for collapsed-row store hydration', () => {
+ const { result } = renderHook(() =>
+ useLinkedRecordsIdentifiers({
+ timelineActivities: [
+ {
+ linkedObjectMetadataId: 'note-object-id',
+ linkedRecordId: 'note-id',
+ } as TimelineActivity,
+ ],
+ objectMetadataItems: [
+ {
+ id: 'note-object-id',
+ nameSingular: 'note',
+ universalIdentifier: 'note-object-universal-identifier',
+ labelIdentifierFieldMetadataId: 'title-field-id',
+ fields: [{ id: 'title-field-id', name: 'title' }],
+ } as EnrichedObjectMetadataItem,
+ ],
+ }),
+ );
+
+ expect(result.current.result).toEqual(linkedRecordsResult);
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/__tests__/useTimelineActivities.test.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/__tests__/useTimelineActivities.test.tsx
index 158b628bee6..7fe5b60c63b 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/__tests__/useTimelineActivities.test.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/__tests__/useTimelineActivities.test.tsx
@@ -39,7 +39,7 @@ describe('useTimelineActivities', () => {
},
workspaceMemberId: '20202020-0687-4c41-b707-ed1bfca972a7',
createdAt: '2024-03-22T08:28:44.830Z',
- name: 'updated.company',
+ timelineActivityTypeId: '20202020-0000-4000-8000-000000000001',
companyId: '460b6fb1-ed89-413a-b31a-962986e67bb4',
properties: '{"diff": {"address": {"after": "Paris", "before": ""}}}',
updatedAt: '2024-03-22T08:28:44.830Z',
@@ -69,7 +69,7 @@ describe('useTimelineActivities', () => {
const wrongMockedTimelineActivities = [
{
...mockedTimelineActivities[0],
- name: 'wrong.updated.company',
+ timelineActivityTypeId: '20202020-0000-4000-8000-000000000002',
},
];
@@ -77,5 +77,10 @@ describe('useTimelineActivities', () => {
expect(result.current.timelineActivities).not.toEqual(
wrongMockedTimelineActivities,
);
+ expect(useFindManyRecordsMock.useFindManyRecords).toHaveBeenCalledWith(
+ expect.objectContaining({
+ orderBy: [{ happensAt: 'DescNullsFirst' }],
+ }),
+ );
});
});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useLinkedObjectsTitle.ts b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useLinkedObjectsTitle.ts
deleted file mode 100644
index edf85ce507f..00000000000
--- a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useLinkedObjectsTitle.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useCombinedFindManyRecords } from '@/object-record/multiple-objects/hooks/useCombinedFindManyRecords';
-import { isNonEmptyArray } from '@sniptt/guards';
-
-export const useLinkedObjectsTitle = (linkedObjectIds: string[]) => {
- const { loading } = useCombinedFindManyRecords({
- skip: !isNonEmptyArray(linkedObjectIds),
- operationSignatures: [
- {
- objectNameSingular: CoreObjectNameSingular.Task,
- variables: {
- filter: {
- id: {
- in: linkedObjectIds ?? [],
- },
- },
- },
- fields: {
- id: true,
- title: true,
- },
- },
- {
- objectNameSingular: CoreObjectNameSingular.Note,
- variables: {
- filter: {
- id: {
- in: linkedObjectIds ?? [],
- },
- },
- },
- fields: {
- id: true,
- title: true,
- },
- },
- ],
- });
-
- return {
- loading,
- };
-};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useLinkedRecordsIdentifiers.ts b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useLinkedRecordsIdentifiers.ts
new file mode 100644
index 00000000000..d5e7fd310fc
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useLinkedRecordsIdentifiers.ts
@@ -0,0 +1,91 @@
+import { useMemo } from 'react';
+import { type RecordGqlOperationSignature } from 'twenty-shared/types';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+
+import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { useCombinedFindManyRecords } from '@/object-record/multiple-objects/hooks/useCombinedFindManyRecords';
+
+export const useLinkedRecordsIdentifiers = ({
+ timelineActivities,
+ objectMetadataItems,
+}: {
+ timelineActivities: TimelineActivity[];
+ objectMetadataItems: EnrichedObjectMetadataItem[];
+}) => {
+ const operationSignatures = useMemo(() => {
+ const objectMetadataItemById = new Map(
+ objectMetadataItems.map((objectMetadataItem) => [
+ objectMetadataItem.id,
+ objectMetadataItem,
+ ]),
+ );
+ const objectMetadataItemByUniversalIdentifier = new Map(
+ objectMetadataItems.map((objectMetadataItem) => [
+ objectMetadataItem.universalIdentifier,
+ objectMetadataItem,
+ ]),
+ );
+ const recordIdsByObjectMetadataId = new Map<string, Set<string>>();
+
+ for (const timelineActivity of timelineActivities) {
+ if (
+ !isDefined(timelineActivity.linkedObjectMetadataId) ||
+ !isDefined(timelineActivity.linkedRecordId)
+ ) {
+ continue;
+ }
+
+ const linkedObjectMetadataItem =
+ objectMetadataItemById.get(timelineActivity.linkedObjectMetadataId) ??
+ (isDefined(
+ timelineActivity.timelineActivityTypeSnapshot
+ ?.objectUniversalIdentifier,
+ )
+ ? objectMetadataItemByUniversalIdentifier.get(
+ timelineActivity.timelineActivityTypeSnapshot
+ .objectUniversalIdentifier,
+ )
+ : undefined);
+
+ if (!isDefined(linkedObjectMetadataItem)) {
+ continue;
+ }
+
+ const recordIds =
+ recordIdsByObjectMetadataId.get(linkedObjectMetadataItem.id) ??
+ new Set<string>();
+
+ recordIds.add(timelineActivity.linkedRecordId);
+ recordIdsByObjectMetadataId.set(linkedObjectMetadataItem.id, recordIds);
+ }
+
+ return [...recordIdsByObjectMetadataId.entries()]
+ .map(([objectMetadataId, recordIds]) => {
+ const objectMetadataItem = objectMetadataItemById.get(objectMetadataId);
+ const labelIdentifierField = objectMetadataItem?.fields.find(
+ (field) =>
+ field.id === objectMetadataItem.labelIdentifierFieldMetadataId,
+ );
+
+ if (
+ !isDefined(objectMetadataItem) ||
+ !isDefined(labelIdentifierField)
+ ) {
+ return undefined;
+ }
+
+ return {
+ objectNameSingular: objectMetadataItem.nameSingular,
+ variables: { filter: { id: { in: [...recordIds] } } },
+ fields: { id: true, [labelIdentifierField.name]: true },
+ } satisfies RecordGqlOperationSignature;
+ })
+ .filter(isDefined);
+ }, [objectMetadataItems, timelineActivities]);
+
+ return useCombinedFindManyRecords({
+ operationSignatures,
+ skip: !isNonEmptyArray(operationSignatures),
+ });
+};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts
index b951e9aae71..f2b55364062 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivities.ts
@@ -1,6 +1,6 @@
import { useCallback, useMemo } from 'react';
-import { useLinkedObjectsTitle } from '@/activities/timeline-activities/hooks/useLinkedObjectsTitle';
+import { useLinkedRecordsIdentifiers } from '@/activities/timeline-activities/hooks/useLinkedRecordsIdentifiers';
import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
import { getTimelineActivityRecordGqlFields } from '@/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields';
import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
@@ -39,16 +39,6 @@ export const useTimelineActivities = (
const { objectMetadataItems: allObjectMetadataItems } =
useObjectMetadataItems();
- const noteObjectMetadataItem = objectMetadataItems.find(
- (objectMetadataItem) =>
- objectMetadataItem.nameSingular === CoreObjectNameSingular.Note,
- );
-
- const taskObjectMetadataItem = objectMetadataItems.find(
- (objectMetadataItem) =>
- objectMetadataItem.nameSingular === CoreObjectNameSingular.Task,
- );
-
const hasTimelineActivityField = timelineActivityMetadata.fields.some(
(field) =>
isDefined(field.morphRelations) &&
@@ -79,7 +69,7 @@ export const useTimelineActivities = (
filter,
orderBy: [
{
- createdAt: 'DescNullsFirst',
+ happensAt: 'DescNullsFirst',
},
],
recordGqlFields,
@@ -115,24 +105,8 @@ export const useTimelineActivities = (
objectMetadataItemId: timelineActivityMetadata.id,
});
- const noteAndTaskObjectMetadataIds = [
- noteObjectMetadataItem?.id,
- taskObjectMetadataItem?.id,
- ].filter(isDefined);
-
- // Notes and tasks expose a title that we resolve to label their timeline rows.
- const noteAndTaskLinkedRecordIds = timelineActivities
- .filter(
- (timelineActivity) =>
- isDefined(timelineActivity.linkedObjectMetadataId) &&
- noteAndTaskObjectMetadataIds.includes(
- timelineActivity.linkedObjectMetadataId,
- ),
- )
- .map((timelineActivity) => timelineActivity.linkedRecordId)
- .filter(isDefined);
-
- useLinkedObjectsTitle(noteAndTaskLinkedRecordIds);
+ const { result: linkedRecordsByObjectNamePlural } =
+ useLinkedRecordsIdentifiers({ timelineActivities, objectMetadataItems });
const firstQueryLoading =
loadingTimelineActivities && timelineActivities.length === 0;
@@ -145,5 +119,6 @@ export const useTimelineActivities = (
firstQueryLoading,
loadingMore,
fetchMoreRecords,
+ linkedRecords: Object.values(linkedRecordsByObjectNamePlural).flat(),
};
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivityTypes.ts b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivityTypes.ts
index 49f72500a72..5a1c978d6f2 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivityTypes.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/hooks/useTimelineActivityTypes.ts
@@ -2,36 +2,40 @@ import { useQuery } from '@apollo/client/react';
import { useMemo } from 'react';
import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
-import {
- isTimelineActivityAction,
- isTimelineActivityRenderer,
-} from 'twenty-shared/timeline';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
+import { isTimelineActivityAction } from 'twenty-shared/timeline';
import { FindManyTimelineActivityTypesDocument } from '~/generated-metadata/graphql';
export const useTimelineActivityTypes = () => {
const { data } = useQuery(FindManyTimelineActivityTypesDocument);
- const timelineActivityTypeById = useMemo(
- () =>
- new Map<string, TimelineActivityType>(
- (data?.timelineActivityTypes ?? []).map((timelineActivityType) => [
+ const timelineActivityTypeMaps = useMemo<TimelineActivityTypeMaps>(() => {
+ const timelineActivityTypes: TimelineActivityType[] = (
+ data?.timelineActivityTypes ?? []
+ ).map(({ emit, ...timelineActivityType }) => ({
+ ...timelineActivityType,
+ action: isTimelineActivityAction(emit?.on) ? emit.on : null,
+ icon: timelineActivityType.icon ?? null,
+ objectUniversalIdentifier: emit?.objectUniversalIdentifier ?? null,
+ frontComponentUniversalIdentifier:
+ timelineActivityType.frontComponentUniversalIdentifier ?? null,
+ }));
+
+ return {
+ byId: new Map(
+ timelineActivityTypes.map((timelineActivityType) => [
timelineActivityType.id,
- {
- ...timelineActivityType,
- action: isTimelineActivityAction(timelineActivityType.action)
- ? timelineActivityType.action
- : null,
- icon: timelineActivityType.icon ?? null,
- renderer: isTimelineActivityRenderer(timelineActivityType.renderer)
- ? timelineActivityType.renderer
- : null,
- objectUniversalIdentifier:
- timelineActivityType.objectUniversalIdentifier ?? null,
- },
+ timelineActivityType,
+ ]),
+ ),
+ byUniversalIdentifier: new Map(
+ timelineActivityTypes.map((timelineActivityType) => [
+ timelineActivityType.universalIdentifier,
+ timelineActivityType,
]),
),
- [data?.timelineActivityTypes],
- );
+ };
+ }, [data?.timelineActivityTypes]);
- return { timelineActivityTypeById };
+ return { timelineActivityTypeMaps };
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx
deleted file mode 100644
index 56fee34668f..00000000000
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/activity/components/EventRowActivity.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { styled } from '@linaria/react';
-import { t } from '@lingui/core/macro';
-
-import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';
-import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
-import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';
-import {
- StyledEventRowContainer,
- StyledEventRowContent,
- StyledEventRowLinkedRecord,
-} from '@/activities/timeline-activities/rows/components/EventRowStyles';
-import { isTimelineActivityWithLinkedRecord } from '@/activities/timeline-activities/types/TimelineActivity';
-import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
-import { type TimelineActivityAction } from 'twenty-shared/timeline';
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { isDefined } from 'twenty-shared/utils';
-import { isNonEmptyString } from '@sniptt/guards';
-import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-type EventRowActivityProps = EventRowDynamicComponentProps;
-
-const getEventActionSentence = (
- eventAction: TimelineActivityAction | null,
- objectNameSingular: string,
-): string => {
- switch (eventAction) {
- case 'created':
- return t`created a related ${objectNameSingular}`;
- case 'updated':
- return t`updated a related ${objectNameSingular}`;
- case 'deleted':
- return t`deleted a related ${objectNameSingular}`;
- case 'restored':
- return t`restored a related ${objectNameSingular}`;
- case 'unlinked':
- return t`unlinked a related ${objectNameSingular}`;
- default:
- return t`linked a related ${objectNameSingular}`;
- }
-};
-
-const StyledEventRow = styled.div`
- display: flex;
- flex-direction: column;
- gap: ${themeCssVariables.spacing[1]};
- width: 100%;
-`;
-
-export const StyledEventRowItemText = styled.span`
- color: ${themeCssVariables.font.color.primary};
-`;
-
-export const EventRowActivity = ({
- event,
- eventAction,
- authorFullName,
- linkedObjectMetadataItem,
- createdAt,
-}: EventRowActivityProps) => {
- if (!isTimelineActivityWithLinkedRecord(event)) {
- throw new Error('Could not find linked record id for event');
- }
-
- if (!isDefined(linkedObjectMetadataItem)) {
- throw new Error('Could not find linked object metadata for event');
- }
-
- const { nameSingular: objectNameSingular } = linkedObjectMetadataItem;
-
- const getActivityFromCache = useGetRecordFromCache({
- objectNameSingular,
- recordGqlFields: {
- id: true,
- title: true,
- },
- });
-
- const activityInStore = getActivityFromCache(event.linkedRecordId);
-
- const computeActivityTitle = () => {
- if (isNonEmptyString(activityInStore?.title)) {
- return activityInStore?.title;
- }
-
- if (isNonEmptyString(event.linkedRecordCachedName)) {
- return event.linkedRecordCachedName;
- }
-
- return t`Untitled`;
- };
- const activityTitle = computeActivityTitle();
-
- const { openRecordInSidePanel } = useOpenRecordInSidePanel();
-
- return (
- <StyledEventRow>
- <StyledEventRowContainer>
- <StyledEventRowContent>
- <EventRowItem>{authorFullName}</EventRowItem>
- <EventRowItem variant="action">
- {getEventActionSentence(eventAction, objectNameSingular)}
- </EventRowItem>
- <StyledEventRowLinkedRecord
- onClick={() =>
- openRecordInSidePanel({
- recordId: event.linkedRecordId,
- objectNameSingular,
- })
- }
- >
- <OverflowingTextWithTooltip text={activityTitle} />
- </StyledEventRowLinkedRecord>
- </StyledEventRowContent>
- <EventRowDate createdAt={createdAt} />
- </StyledEventRowContainer>
- </StyledEventRow>
- );
-};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx
index dc9a17a2de5..1546a218d7a 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent.tsx
@@ -1,19 +1,21 @@
+import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
-import { isUndefined } from '@sniptt/guards';
+import { useContext } from 'react';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+import {
+ isDefined,
+ isFieldValueRestricted,
+ isNonEmptyArray,
+} from 'twenty-shared/utils';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { CalendarEventNotSharedContent } from '@/activities/calendar/components/CalendarEventNotSharedContent';
import { CalendarEventParticipantsAvatarGroup } from '@/activities/calendar/components/CalendarEventParticipantsAvatarGroup';
import { type CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
-import { useOpenCalendarEventInSidePanel } from '@/side-panel/hooks/useOpenCalendarEventInSidePanel';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+import { useOpenCalendarEventInSidePanel } from '@/side-panel/hooks/useOpenCalendarEventInSidePanel';
import { UserContext } from '@/users/contexts/UserContext';
-import { useContext } from 'react';
-import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
-import { CombinedGraphQLErrors } from '@apollo/client/errors';
-import { isDefined } from 'twenty-shared/utils';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
formatToHumanReadableDay,
formatToHumanReadableMonth,
@@ -21,10 +23,8 @@ import {
} from '~/utils/format/formatDate';
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
-const StyledEventCardCalendarEventContainer = styled.div<{
- canOpen?: boolean;
-}>`
- cursor: ${({ canOpen }) => (canOpen ? 'pointer' : 'not-allowed')};
+const StyledEventCardCalendarEventContainer = styled.div`
+ cursor: pointer;
display: flex;
flex-direction: row;
gap: ${themeCssVariables.spacing[2]};
@@ -63,7 +63,6 @@ const StyledCalendarEventBody = styled.div`
flex: 1 0 0;
flex-direction: column;
gap: ${themeCssVariables.spacing[2]};
-
justify-content: center;
`;
@@ -74,7 +73,6 @@ const StyledCalendarEventDateCard = styled.div`
display: flex;
flex-direction: column;
gap: ${themeCssVariables.spacing[1]};
-
justify-content: center;
padding: ${themeCssVariables.spacing[1]};
`;
@@ -97,6 +95,7 @@ export const EventCardCalendarEvent = ({
calendarEventId: string;
}) => {
const { openCalendarEventInSidePanel } = useOpenCalendarEventInSidePanel();
+ const { timeZone } = useContext(UserContext);
const {
record: calendarEvent,
@@ -124,23 +123,21 @@ export const EventCardCalendarEvent = ({
},
});
- const { timeZone } = useContext(UserContext);
-
if (isDefined(error)) {
if (CombinedGraphQLErrors.is(error)) {
- const shouldHideMessageContent = error.errors.some(
- (e) => e.extensions?.code === 'FORBIDDEN',
- );
-
- if (shouldHideMessageContent) {
+ if (
+ error.errors.some(
+ (graphQLError) => graphQLError.extensions?.code === 'FORBIDDEN',
+ )
+ ) {
return <CalendarEventNotSharedContent />;
}
- const shouldHandleNotFound = error.errors.some(
- (e) => e.extensions?.code === 'NOT_FOUND',
- );
-
- if (shouldHandleNotFound) {
+ if (
+ error.errors.some(
+ (graphQLError) => graphQLError.extensions?.code === 'NOT_FOUND',
+ )
+ ) {
return <div>{t`Calendar event not found`}</div>;
}
}
@@ -148,39 +145,40 @@ export const EventCardCalendarEvent = ({
return <div>{t`Error loading calendar event`}</div>;
}
- if (loading || isUndefined(calendarEvent)) {
+ if (loading) {
return <div>{t`Loading...`}</div>;
}
- const startsAtDate = calendarEvent?.startsAt;
- const endsAtDate = calendarEvent?.endsAt;
-
- if (isUndefinedOrNull(startsAtDate)) {
- throw new Error("Can't render a calendarEvent without a start date");
+ if (!isDefined(calendarEvent)) {
+ return <CalendarEventNotSharedContent />;
}
- const startsAtMonth = formatToHumanReadableMonth(startsAtDate, timeZone);
+ if (isFieldValueRestricted(calendarEvent.title)) {
+ return <CalendarEventNotSharedContent />;
+ }
- const startsAtDay = formatToHumanReadableDay(startsAtDate, timeZone);
+ if (isUndefinedOrNull(calendarEvent.startsAt)) {
+ return <div>{t`Calendar event has no start date`}</div>;
+ }
- const startsAtHour = formatToHumanReadableTime(startsAtDate, timeZone);
- const endsAtHour = endsAtDate
- ? formatToHumanReadableTime(endsAtDate, timeZone)
+ const startsAtMonth = formatToHumanReadableMonth(
+ calendarEvent.startsAt,
+ timeZone,
+ );
+ const startsAtDay = formatToHumanReadableDay(
+ calendarEvent.startsAt,
+ timeZone,
+ );
+ const startsAtTime = formatToHumanReadableTime(
+ calendarEvent.startsAt,
+ timeZone,
+ );
+ const endsAtTime = isDefined(calendarEvent.endsAt)
+ ? formatToHumanReadableTime(calendarEvent.endsAt, timeZone)
: null;
-
- const canOpen =
- calendarEvent.title !== FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED;
-
- const handleClick = () => {
- if (canOpen) {
- openCalendarEventInSidePanel(calendarEventId);
- }
- };
-
return (
<StyledEventCardCalendarEventContainer
- onClick={handleClick}
- canOpen={canOpen}
+ onClick={() => openCalendarEventInSidePanel(calendarEventId)}
>
<StyledCalendarEventDateCard>
<StyledCalendarEventDateCardMonth>
@@ -192,25 +190,19 @@ export const EventCardCalendarEvent = ({
</StyledCalendarEventDateCard>
<StyledCalendarEventContent>
<StyledCalendarEventTop>
- {calendarEvent.title ===
- FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED ? (
- <CalendarEventNotSharedContent />
- ) : (
- <StyledCalendarEventTitle>
- {calendarEvent.title}
- </StyledCalendarEventTitle>
- )}
- {(!!calendarEvent.calendarEventParticipants?.length ||
- !!calendarEvent.callRecordings?.length) && (
+ <StyledCalendarEventTitle>
+ {calendarEvent.title}
+ </StyledCalendarEventTitle>
+ {(isNonEmptyArray(calendarEvent.calendarEventParticipants) ||
+ isNonEmptyArray(calendarEvent.callRecordings)) && (
<CalendarEventParticipantsAvatarGroup
participants={calendarEvent.calendarEventParticipants ?? []}
- callRecordings={calendarEvent.callRecordings}
+ callRecordings={calendarEvent.callRecordings ?? []}
/>
)}
</StyledCalendarEventTop>
-
<StyledCalendarEventBody>
- {startsAtHour} {endsAtHour && <>→ {endsAtHour}</>}
+ {startsAtTime} {isDefined(endsAtTime) && <>→ {endsAtTime}</>}
</StyledCalendarEventBody>
</StyledCalendarEventContent>
</StyledEventCardCalendarEventContainer>
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventRowCalendarEvent.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventRowCalendarEvent.tsx
deleted file mode 100644
index c77c7c7544d..00000000000
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/EventRowCalendarEvent.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { styled } from '@linaria/react';
-import { useLingui } from '@lingui/react/macro';
-import { useState } from 'react';
-
-import { EventCardCalendarEvent } from '@/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent';
-import { EventCard } from '@/activities/timeline-activities/rows/components/EventCard';
-import { EventCardToggleButton } from '@/activities/timeline-activities/rows/components/EventCardToggleButton';
-import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
-import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';
-import { isTimelineActivityWithLinkedRecord } from '@/activities/timeline-activities/types/TimelineActivity';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-type EventRowCalendarEventProps = EventRowDynamicComponentProps;
-
-const StyledEventRowCalendarEventContainer = styled.div`
- display: flex;
- flex-direction: column;
- gap: ${themeCssVariables.spacing[1]};
-`;
-
-const StyledRowContainer = styled.div`
- display: flex;
- flex-direction: row;
- gap: ${themeCssVariables.spacing[1]};
-`;
-
-export const EventRowCalendarEvent = ({
- event,
- eventAction,
- authorFullName,
- labelIdentifierValue,
-}: EventRowCalendarEventProps) => {
- const { t } = useLingui();
- const [isOpen, setIsOpen] = useState(false);
-
- if (eventAction !== 'linked') {
- throw new Error('Invalid event action for calendarEvent event type.');
- }
-
- return (
- <StyledEventRowCalendarEventContainer>
- <StyledRowContainer>
- <EventRowItem>{authorFullName}</EventRowItem>
- <EventRowItem variant="action">
- {t`linked a calendar event with ${labelIdentifierValue}`}
- </EventRowItem>
- <EventCardToggleButton isOpen={isOpen} setIsOpen={setIsOpen} />
- </StyledRowContainer>
- {isTimelineActivityWithLinkedRecord(event) && (
- <EventCard isOpen={isOpen}>
- <EventCardCalendarEvent calendarEventId={event.linkedRecordId} />
- </EventCard>
- )}
- </StyledEventRowCalendarEventContainer>
- );
-};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/__stories__/EventCardCalendarEvent.stories.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/__stories__/EventCardCalendarEvent.stories.tsx
index 95a2b288624..b687e035bb5 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/__stories__/EventCardCalendarEvent.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/__stories__/EventCardCalendarEvent.stories.tsx
@@ -1,11 +1,11 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { HttpResponse, graphql } from 'msw';
+import { ComponentDecorator } from 'twenty-ui/testing';
import { EventCardCalendarEvent } from '@/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent';
-import { ComponentDecorator } from 'twenty-ui/testing';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
const meta: Meta<typeof EventCardCalendarEvent> = {
title: 'Modules/TimelineActivities/Rows/CalendarEvent/EventCardCalendarEvent',
@@ -28,8 +28,8 @@ export const Default: Story = {
parameters: {
msw: {
handlers: [
- graphql.query('FindOneCalendarEvent', () => {
- return HttpResponse.json({
+ graphql.query('FindOneCalendarEvent', () =>
+ HttpResponse.json({
data: {
calendarEvent: {
id: '1',
@@ -38,8 +38,8 @@ export const Default: Story = {
endsAt: '2022-01-01T01:00:00Z',
},
},
- });
- }),
+ }),
+ ),
],
},
},
@@ -52,18 +52,16 @@ export const NotShared: Story = {
parameters: {
msw: {
handlers: [
- graphql.query('FindOneCalendarEvent', () => {
- return HttpResponse.json({
+ graphql.query('FindOneCalendarEvent', () =>
+ HttpResponse.json({
errors: [
{
message: 'Forbidden',
- extensions: {
- code: 'FORBIDDEN',
- },
+ extensions: { code: 'FORBIDDEN' },
},
],
- });
- }),
+ }),
+ ),
],
},
},
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/__tests__/EventCardCalendarEvent.test.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/__tests__/EventCardCalendarEvent.test.tsx
new file mode 100644
index 00000000000..575361cf264
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/calendar/components/__tests__/EventCardCalendarEvent.test.tsx
@@ -0,0 +1,100 @@
+import { CombinedGraphQLErrors } from '@apollo/client/errors';
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { render, screen } from '@testing-library/react';
+import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
+import { ThemeProvider } from 'twenty-ui/theme-constants';
+
+import { EventCardCalendarEvent } from '@/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent';
+import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+import { UserContext } from '@/users/contexts/UserContext';
+import { DateFormat } from '@/localization/constants/DateFormat';
+import { TimeFormat } from '@/localization/constants/TimeFormat';
+
+jest.mock('@/object-record/hooks/useFindOneRecord', () => ({
+ useFindOneRecord: jest.fn(),
+}));
+jest.mock('@/side-panel/hooks/useOpenCalendarEventInSidePanel', () => ({
+ useOpenCalendarEventInSidePanel: () => ({
+ openCalendarEventInSidePanel: jest.fn(),
+ }),
+}));
+jest.mock(
+ '@/activities/calendar/components/CalendarEventParticipantsAvatarGroup',
+ () => ({ CalendarEventParticipantsAvatarGroup: () => null }),
+);
+
+const renderCard = () =>
+ render(
+ <I18nProvider i18n={i18n}>
+ <ThemeProvider colorScheme="light">
+ <UserContext.Provider
+ value={{
+ dateFormat: DateFormat.MONTH_FIRST,
+ timeFormat: TimeFormat.HOUR_24,
+ timeZone: 'UTC',
+ }}
+ >
+ <EventCardCalendarEvent calendarEventId="calendar-event-id" />
+ </UserContext.Provider>
+ </ThemeProvider>
+ </I18nProvider>,
+ );
+
+describe('EventCardCalendarEvent', () => {
+ it('does not render a title masked by calendar visibility', () => {
+ jest.mocked(useFindOneRecord).mockReturnValue({
+ record: {
+ id: 'calendar-event-id',
+ title: FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED,
+ startsAt: '2026-08-22T10:00:00.000Z',
+ endsAt: '2026-08-22T11:00:00.000Z',
+ calendarEventParticipants: [],
+ callRecordings: [],
+ },
+ loading: false,
+ error: undefined,
+ } as never);
+
+ renderCard();
+
+ expect(screen.getByText('Not shared')).toBeInTheDocument();
+ expect(
+ screen.queryByText(FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED),
+ ).not.toBeInTheDocument();
+ expect(screen.queryByText(/10:00/)).not.toBeInTheDocument();
+ });
+
+ it('renders the not-shared state when record access is forbidden', () => {
+ jest.mocked(useFindOneRecord).mockReturnValue({
+ record: undefined,
+ loading: false,
+ error: new CombinedGraphQLErrors({
+ data: null,
+ errors: [
+ {
+ message: 'Forbidden',
+ extensions: { code: 'FORBIDDEN' },
+ },
+ ],
+ }),
+ } as never);
+
+ renderCard();
+
+ expect(screen.getByText('Not shared')).toBeInTheDocument();
+ });
+
+ it('fails closed when a hidden record is omitted without an error', () => {
+ jest.mocked(useFindOneRecord).mockReturnValue({
+ record: undefined,
+ loading: false,
+ error: undefined,
+ } as never);
+
+ renderCard();
+
+ expect(screen.getByText('Not shared')).toBeInTheDocument();
+ expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx
index 702f8ef75e1..1b0a501d027 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx
@@ -1,4 +1,5 @@
import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
import { IconButton } from 'twenty-ui/input';
import { IconChevronDown, IconChevronUp } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -16,11 +17,14 @@ export const EventCardToggleButton = ({
isOpen,
setIsOpen,
}: EventCardToggleButtonProps) => {
+ const { t } = useLingui();
+
return (
<StyledButtonContainer>
<IconButton
Icon={isOpen ? IconChevronUp : IconChevronDown}
onClick={() => setIsOpen(!isOpen)}
+ ariaLabel={isOpen ? t`Collapse details` : t`Expand details`}
size="small"
variant="secondary"
/>
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
index dd31003a731..0b6b995b5f3 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
@@ -20,26 +20,26 @@ const StyledEventRowDate = styled.div`
`;
type EventRowDateProps = {
- createdAt?: string;
+ happensAt?: string;
};
-export const EventRowDate = ({ createdAt }: EventRowDateProps) => {
+export const EventRowDate = ({ happensAt }: EventRowDateProps) => {
const { dateFormat, timeFormat, timeZone } = useDateTimeFormat();
const { localeCatalog } = useAtomStateValue(dateLocaleState);
const instanceId = useId();
const dateElementId = `event-row-date-${instanceId.replace(/[^a-zA-Z0-9-_]/g, '-')}`;
- if (!isNonEmptyString(createdAt)) {
+ if (!isNonEmptyString(happensAt)) {
return null;
}
- const relativeCreatedAt = beautifyPastDateRelativeToNow(
- createdAt,
+ const relativeHappensAt = beautifyPastDateRelativeToNow(
+ happensAt,
localeCatalog,
);
- const exactCreatedAt = formatDateTimeString({
- value: createdAt,
+ const exactHappensAt = formatDateTimeString({
+ value: happensAt,
timeZone,
dateFormat,
timeFormat,
@@ -49,11 +49,11 @@ export const EventRowDate = ({ createdAt }: EventRowDateProps) => {
return (
<>
<StyledEventRowDate id={dateElementId} tabIndex={0}>
- {relativeCreatedAt}
+ {relativeHappensAt}
</StyledEventRowDate>
<AppTooltip
anchorSelect={`#${dateElementId}`}
- content={exactCreatedAt}
+ content={exactHappensAt}
delay={TooltipDelay.mediumDelay}
noArrow
place="left"
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.tsx
index 833b4385775..f3fc7b4aabd 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.tsx
@@ -1,61 +1,98 @@
-import { TIMELINE_ACTIVITY_ROW_COMPONENT_BY_RENDERER } from '@/activities/timeline-activities/constants/TimelineActivityRowComponentByRenderer';
import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { type TimelineActivityRenderer } from 'twenty-shared/timeline';
+import { EventCard } from '@/activities/timeline-activities/rows/components/EventCard';
+import { EventCardToggleButton } from '@/activities/timeline-activities/rows/components/EventCardToggleButton';
+import { EventRowGenericLinked } from '@/activities/timeline-activities/rows/generic/components/EventRowGenericLinked';
+import { EventRowMainObject } from '@/activities/timeline-activities/rows/main-object/components/EventRowMainObject';
+import { styled } from '@linaria/react';
+import { lazy, Suspense, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
-const getLegacyTimelineActivityRenderer = (
- linkedObjectNameSingular: string | undefined,
-): TimelineActivityRenderer => {
- switch (linkedObjectNameSingular) {
- case CoreObjectNameSingular.Note:
- case CoreObjectNameSingular.Task:
- return 'activity';
- case CoreObjectNameSingular.Message:
- return 'message';
- case CoreObjectNameSingular.CalendarEvent:
- return 'calendarEvent';
- default:
- return isDefined(linkedObjectNameSingular)
- ? 'genericLinked'
- : 'mainObject';
- }
-};
+const FrontComponentRenderer = lazy(() =>
+ import('@/front-components/components/FrontComponentRenderer').then(
+ (module) => ({ default: module.FrontComponentRenderer }),
+ ),
+);
+
+const StyledContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[1]};
+ width: 100%;
+`;
+
+const StyledNativeRowContainer = styled.div`
+ align-items: flex-start;
+ display: flex;
+ gap: ${themeCssVariables.spacing[1]};
+ width: 100%;
+`;
+
+const StyledNativeRow = styled.div`
+ min-width: 0;
+ width: 100%;
+`;
export const EventRowDynamicComponent = ({
labelIdentifierValue,
event,
eventAction,
- eventRenderer,
+ eventTypeLabel,
+ renderer,
mainObjectMetadataItem,
linkedObjectMetadataItem,
authorFullName,
- createdAt,
+ happensAt,
}: EventRowDynamicComponentProps) => {
- const renderer =
- eventRenderer ??
- // Old pods can write name-only rows after the 2.33 backfill has run.
- (isDefined(event.timelineActivityTypeId)
- ? isDefined(linkedObjectMetadataItem)
- ? 'genericLinked'
- : 'mainObject'
- : getLegacyTimelineActivityRenderer(
- linkedObjectMetadataItem?.nameSingular,
- ));
-
- const EventRowComponent =
- TIMELINE_ACTIVITY_ROW_COMPONENT_BY_RENDERER[renderer];
+ const [isRendererOpen, setIsRendererOpen] = useState(false);
+ const EventRowComponent = isDefined(event.linkedRecordId)
+ ? EventRowGenericLinked
+ : EventRowMainObject;
- return (
+ const nativeRenderer = (
<EventRowComponent
labelIdentifierValue={labelIdentifierValue}
event={event}
eventAction={eventAction}
- eventRenderer={eventRenderer}
+ eventTypeLabel={eventTypeLabel}
+ hasRenderer={isDefined(renderer)}
mainObjectMetadataItem={mainObjectMetadataItem}
linkedObjectMetadataItem={linkedObjectMetadataItem}
authorFullName={authorFullName}
- createdAt={createdAt}
+ happensAt={happensAt}
/>
);
+
+ if (!isDefined(renderer)) {
+ return nativeRenderer;
+ }
+
+ return (
+ <StyledContainer>
+ <StyledNativeRowContainer>
+ <StyledNativeRow>{nativeRenderer}</StyledNativeRow>
+ <EventCardToggleButton
+ isOpen={isRendererOpen}
+ setIsOpen={setIsRendererOpen}
+ />
+ </StyledNativeRowContainer>
+ {isRendererOpen && (
+ <EventCard isOpen>
+ <Suspense fallback={null}>
+ {renderer.type === 'standard' ? (
+ <renderer.Component
+ event={event}
+ authorFullName={authorFullName}
+ />
+ ) : (
+ <FrontComponentRenderer
+ frontComponentId={renderer.frontComponentId}
+ timelineActivityId={event.id}
+ />
+ )}
+ </Suspense>
+ </EventCard>
+ )}
+ </StyledContainer>
+ );
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.types.ts b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.types.ts
index aeaade8bbcf..d14cbba20ab 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.types.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDynamicComponent.types.ts
@@ -1,17 +1,23 @@
import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
+import { type TimelineActivityRenderer } from '@/activities/timeline-activities/rows/components/TimelineActivityRenderer';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import {
- type TimelineActivityAction,
- type TimelineActivityRenderer,
-} from 'twenty-shared/timeline';
+import { type TimelineActivityAction } from 'twenty-shared/timeline';
-export type EventRowDynamicComponentProps = {
+export type EventRowNativeComponentProps = {
labelIdentifierValue: string;
event: TimelineActivity;
eventAction: TimelineActivityAction | null;
- eventRenderer: TimelineActivityRenderer | null;
+ eventTypeLabel?: string;
+ hasRenderer?: boolean;
mainObjectMetadataItem: EnrichedObjectMetadataItem;
linkedObjectMetadataItem: EnrichedObjectMetadataItem | null;
authorFullName: string;
- createdAt?: string;
+ happensAt?: string;
+};
+
+export type EventRowDynamicComponentProps = Omit<
+ EventRowNativeComponentProps,
+ 'hasRenderer'
+> & {
+ renderer: TimelineActivityRenderer | null;
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/StandardTimelineActivityRenderer.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/StandardTimelineActivityRenderer.tsx
new file mode 100644
index 00000000000..3403a78dd19
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/StandardTimelineActivityRenderer.tsx
@@ -0,0 +1,69 @@
+import { lazy, type ComponentType } from 'react';
+import {
+ isStandardTimelineActivityRendererUniversalIdentifier,
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS,
+ type StandardTimelineActivityRendererUniversalIdentifier,
+} from 'twenty-shared/timeline';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type StandardTimelineActivityRendererProps } from '@/activities/timeline-activities/rows/components/TimelineActivityRenderer';
+import { isTimelineActivityWithLinkedRecord } from '@/activities/timeline-activities/types/TimelineActivity';
+
+const EventCardCalendarEvent = lazy(() =>
+ import('@/activities/timeline-activities/rows/calendar/components/EventCardCalendarEvent').then(
+ (module) => ({ default: module.EventCardCalendarEvent }),
+ ),
+);
+
+const EventCardMessage = lazy(() =>
+ import('@/activities/timeline-activities/rows/message/components/EventCardMessage').then(
+ (module) => ({ default: module.EventCardMessage }),
+ ),
+);
+
+type MessageTimelineActivityRendererProps =
+ StandardTimelineActivityRendererProps;
+
+const MessageTimelineActivityRenderer = ({
+ event,
+ authorFullName,
+}: MessageTimelineActivityRendererProps) =>
+ isTimelineActivityWithLinkedRecord(event) ? (
+ <EventCardMessage
+ messageId={event.linkedRecordId}
+ authorFullName={authorFullName}
+ />
+ ) : null;
+
+type CalendarEventTimelineActivityRendererProps =
+ StandardTimelineActivityRendererProps;
+
+const CalendarEventTimelineActivityRenderer = ({
+ event,
+}: CalendarEventTimelineActivityRendererProps) =>
+ isTimelineActivityWithLinkedRecord(event) ? (
+ <EventCardCalendarEvent calendarEventId={event.linkedRecordId} />
+ ) : null;
+
+const STANDARD_TIMELINE_ACTIVITY_RENDERERS: Record<
+ StandardTimelineActivityRendererUniversalIdentifier,
+ ComponentType<StandardTimelineActivityRendererProps>
+> = {
+ [STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message]:
+ MessageTimelineActivityRenderer,
+ [STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.calendarEvent]:
+ CalendarEventTimelineActivityRenderer,
+};
+
+export const getStandardTimelineActivityRenderer = (
+ universalIdentifier: string | null | undefined,
+): ComponentType<StandardTimelineActivityRendererProps> | null => {
+ if (
+ !isDefined(universalIdentifier) ||
+ !isStandardTimelineActivityRendererUniversalIdentifier(universalIdentifier)
+ ) {
+ return null;
+ }
+
+ return STANDARD_TIMELINE_ACTIVITY_RENDERERS[universalIdentifier];
+};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/TimelineActivityRenderer.ts b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/TimelineActivityRenderer.ts
new file mode 100644
index 00000000000..20ebe299d0e
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/TimelineActivityRenderer.ts
@@ -0,0 +1,18 @@
+import { type ComponentType } from 'react';
+
+import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
+
+export type StandardTimelineActivityRendererProps = {
+ event: TimelineActivity;
+ authorFullName: string;
+};
+
+export type TimelineActivityRenderer =
+ | {
+ type: 'standard';
+ Component: ComponentType<StandardTimelineActivityRendererProps>;
+ }
+ | {
+ type: 'frontComponent';
+ frontComponentId: string;
+ };
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__stories__/EventRowDate.stories.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__stories__/EventRowDate.stories.tsx
index 6a67a922710..c556bb63dc7 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__stories__/EventRowDate.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__stories__/EventRowDate.stories.tsx
@@ -15,12 +15,12 @@ type Story = StoryObj<typeof EventRowDate>;
export const Default: Story = {
args: {
- createdAt: '2024-03-09T09:30:00.000Z',
+ happensAt: '2024-03-09T09:30:00.000Z',
},
};
export const WithoutDate: Story = {
args: {
- createdAt: undefined,
+ happensAt: undefined,
},
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__tests__/EventRowDynamicComponent.test.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__tests__/EventRowDynamicComponent.test.tsx
new file mode 100644
index 00000000000..eec270b2bd3
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__tests__/EventRowDynamicComponent.test.tsx
@@ -0,0 +1,81 @@
+import { EventRowDynamicComponent } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent';
+import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+jest.mock(
+ '@/activities/timeline-activities/rows/main-object/components/EventRowMainObject',
+ () => ({ EventRowMainObject: () => <div>Native timeline row</div> }),
+);
+
+jest.mock('@/front-components/components/FrontComponentRenderer', () => ({
+ FrontComponentRenderer: () => <div>Application timeline component</div>,
+}));
+
+const mainObjectMetadataItem = {} as EnrichedObjectMetadataItem;
+
+describe('EventRowDynamicComponent', () => {
+ it('mounts the front component only after the row is expanded', async () => {
+ const user = userEvent.setup();
+
+ render(
+ <I18nProvider i18n={i18n}>
+ <EventRowDynamicComponent
+ labelIdentifierValue="Acme"
+ event={{ id: 'activity-id', properties: {} } as TimelineActivity}
+ eventAction="created"
+ eventTypeLabel="was created"
+ renderer={{
+ type: 'frontComponent',
+ frontComponentId: 'front-component-id',
+ }}
+ mainObjectMetadataItem={mainObjectMetadataItem}
+ linkedObjectMetadataItem={null}
+ authorFullName="Ada Lovelace"
+ />
+ </I18nProvider>,
+ );
+
+ expect(screen.getByText('Native timeline row')).toBeInTheDocument();
+ expect(
+ screen.queryByText('Application timeline component'),
+ ).not.toBeInTheDocument();
+
+ await user.click(screen.getByRole('button', { name: 'Expand details' }));
+
+ expect(
+ await screen.findByText('Application timeline component'),
+ ).toBeInTheDocument();
+ });
+
+ it('mounts a standard renderer only after the row is expanded', async () => {
+ const user = userEvent.setup();
+ const StandardRenderer = () => <div>Standard timeline component</div>;
+
+ render(
+ <I18nProvider i18n={i18n}>
+ <EventRowDynamicComponent
+ labelIdentifierValue="Acme"
+ event={{ id: 'activity-id', properties: {} } as TimelineActivity}
+ eventAction="created"
+ eventTypeLabel="was created"
+ renderer={{ type: 'standard', Component: StandardRenderer }}
+ mainObjectMetadataItem={mainObjectMetadataItem}
+ linkedObjectMetadataItem={null}
+ authorFullName="Ada Lovelace"
+ />
+ </I18nProvider>,
+ );
+
+ expect(
+ screen.queryByText('Standard timeline component'),
+ ).not.toBeInTheDocument();
+
+ await user.click(screen.getByRole('button', { name: 'Expand details' }));
+
+ expect(screen.getByText('Standard timeline component')).toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__tests__/StandardTimelineActivityRenderer.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__tests__/StandardTimelineActivityRenderer.test.ts
new file mode 100644
index 00000000000..501f6f38829
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/__tests__/StandardTimelineActivityRenderer.test.ts
@@ -0,0 +1,21 @@
+import { STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS } from 'twenty-shared/timeline';
+
+import { getStandardTimelineActivityRenderer } from '@/activities/timeline-activities/rows/components/StandardTimelineActivityRenderer';
+
+describe('getStandardTimelineActivityRenderer', () => {
+ it.each(
+ Object.values(STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS),
+ )('resolves the standard renderer %s', (universalIdentifier) => {
+ expect(
+ getStandardTimelineActivityRenderer(universalIdentifier),
+ ).not.toBeNull();
+ });
+
+ it('does not resolve unknown renderer identifiers', () => {
+ expect(
+ getStandardTimelineActivityRenderer(
+ '00000000-0000-4000-8000-000000000001',
+ ),
+ ).toBeNull();
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx
index 955c58c303c..9f5bc51935f 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx
@@ -1,9 +1,12 @@
import { t } from '@lingui/core/macro';
-import { type KeyboardEvent } from 'react';
+import { type KeyboardEvent, useState } from 'react';
+import { EventCard } from '@/activities/timeline-activities/rows/components/EventCard';
+import { EventCardToggleButton } from '@/activities/timeline-activities/rows/components/EventCardToggleButton';
import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';
-import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
+import { type EventRowNativeComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';
+import { getAuthorizedLinkedRecordName } from '@/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName';
import {
StyledEventRowContainer,
StyledEventRowContent,
@@ -11,38 +14,75 @@ import {
} from '@/activities/timeline-activities/rows/components/EventRowStyles';
import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { isDefined } from 'twenty-shared/utils';
-import { isNonEmptyString } from '@sniptt/guards';
import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { SidePanelSearchRecordPreviewCard } from '@/side-panel/pages/search/components/SidePanelSearchRecordPreviewCard';
+import { allowRequestsToTwentyIconsState } from '@/client-config/states/allowRequestsToTwentyIcons';
+import { recordStoreIdentifierFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreIdentifierFamilySelector';
+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { styled } from '@linaria/react';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
-type EventRowGenericLinkedProps = EventRowDynamicComponentProps;
+type EventRowGenericLinkedProps = EventRowNativeComponentProps;
+
+const StyledGenericLinkedContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[1]};
+ width: 100%;
+`;
export const EventRowGenericLinked = ({
event,
+ eventTypeLabel,
authorFullName,
linkedObjectMetadataItem,
- createdAt,
+ happensAt,
+ hasRenderer,
}: EventRowGenericLinkedProps) => {
const { openRecordInSidePanel } = useOpenRecordInSidePanel();
+ const [isOpen, setIsOpen] = useState(false);
+
+ const allowRequestsToTwentyIcons = useAtomStateValue(
+ allowRequestsToTwentyIconsState,
+ );
+ const linkedRecordIdentifier = useAtomFamilySelectorValue(
+ recordStoreIdentifierFamilySelector,
+ {
+ recordId: event.linkedRecordId ?? '',
+ allowRequestsToTwentyIcons,
+ },
+ );
const objectLabel =
linkedObjectMetadataItem?.labelSingular?.toLowerCase() ?? t`record`;
- const linkedRecordName = isNonEmptyString(event.linkedRecordCachedName)
- ? event.linkedRecordCachedName
- : t`Untitled`;
+ const linkedRecordName = getAuthorizedLinkedRecordName(
+ linkedRecordIdentifier?.name,
+ );
- const canOpen =
+ const linkedRecord =
isDefined(event.linkedRecordId) &&
- isDefined(linkedObjectMetadataItem?.nameSingular);
+ isDefined(linkedObjectMetadataItem?.nameSingular)
+ ? {
+ id: event.linkedRecordId,
+ objectNameSingular: linkedObjectMetadataItem.nameSingular,
+ }
+ : undefined;
+
+ const canOpen =
+ hasRenderer !== true &&
+ isDefined(linkedRecord) &&
+ isDefined(linkedRecordName);
const handleOpen = () => {
- if (!canOpen) {
+ if (!isDefined(linkedRecord)) {
return;
}
openRecordInSidePanel({
- recordId: event.linkedRecordId as string,
- objectNameSingular: linkedObjectMetadataItem?.nameSingular as string,
+ recordId: linkedRecord.id,
+ objectNameSingular: linkedRecord.objectNameSingular,
});
};
@@ -54,22 +94,38 @@ export const EventRowGenericLinked = ({
};
return (
- <StyledEventRowContainer>
- <StyledEventRowContent>
- <EventRowItem>{authorFullName}</EventRowItem>
- <EventRowItem variant="action">
- {t`linked a ${objectLabel}`}
- </EventRowItem>
- <StyledEventRowLinkedRecord
- role={canOpen ? 'button' : undefined}
- tabIndex={canOpen ? 0 : undefined}
- onClick={handleOpen}
- onKeyDown={handleKeyDown}
- >
- <OverflowingTextWithTooltip text={linkedRecordName} />
- </StyledEventRowLinkedRecord>
- </StyledEventRowContent>
- <EventRowDate createdAt={createdAt} />
- </StyledEventRowContainer>
+ <StyledGenericLinkedContainer>
+ <StyledEventRowContainer>
+ <StyledEventRowContent>
+ <EventRowItem>{authorFullName}</EventRowItem>
+ <EventRowItem variant="action">
+ {eventTypeLabel ?? t`linked a ${objectLabel}`}
+ </EventRowItem>
+ {canOpen && (
+ <StyledEventRowLinkedRecord
+ role="button"
+ tabIndex={0}
+ onClick={handleOpen}
+ onKeyDown={handleKeyDown}
+ >
+ <OverflowingTextWithTooltip text={linkedRecordName} />
+ </StyledEventRowLinkedRecord>
+ )}
+ {canOpen && (
+ <EventCardToggleButton isOpen={isOpen} setIsOpen={setIsOpen} />
+ )}
+ </StyledEventRowContent>
+ <EventRowDate happensAt={happensAt} />
+ </StyledEventRowContainer>
+ {canOpen && (
+ <EventCard isOpen={isOpen}>
+ <SidePanelSearchRecordPreviewCard
+ objectNameSingular={linkedRecord.objectNameSingular}
+ recordId={linkedRecord.id}
+ label={linkedRecordName}
+ />
+ </EventCard>
+ )}
+ </StyledGenericLinkedContainer>
);
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/utils/__tests__/getAuthorizedLinkedRecordName.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/utils/__tests__/getAuthorizedLinkedRecordName.test.ts
new file mode 100644
index 00000000000..2bc7124a565
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/utils/__tests__/getAuthorizedLinkedRecordName.test.ts
@@ -0,0 +1,23 @@
+import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
+
+import { getAuthorizedLinkedRecordName } from '@/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName';
+
+describe('getAuthorizedLinkedRecordName', () => {
+ it('returns a readable live record identifier', () => {
+ expect(getAuthorizedLinkedRecordName('Quarterly planning')).toBe(
+ 'Quarterly planning',
+ );
+ });
+
+ it('does not expose a restricted-field marker', () => {
+ expect(
+ getAuthorizedLinkedRecordName(
+ FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED,
+ ),
+ ).toBeUndefined();
+ });
+
+ it('does not manufacture a fallback when the record is unavailable', () => {
+ expect(getAuthorizedLinkedRecordName(undefined)).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName.ts b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName.ts
new file mode 100644
index 00000000000..bd43acc17de
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName.ts
@@ -0,0 +1,10 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { isFieldValueRestricted } from 'twenty-shared/utils';
+
+export const getAuthorizedLinkedRecordName = (
+ recordIdentifierName: string | undefined,
+): string | undefined =>
+ isNonEmptyString(recordIdentifierName) &&
+ !isFieldValueRestricted(recordIdentifierName)
+ ? recordIdentifierName
+ : undefined;
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx
index b7bf4c06e2c..1370f55c4b0 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx
@@ -1,12 +1,13 @@
import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';
-import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
+import { type EventRowNativeComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';
import { EventRowMainObjectUpdated } from '@/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
+import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-type EventRowMainObjectProps = EventRowDynamicComponentProps;
+type EventRowMainObjectProps = EventRowNativeComponentProps;
const StyledMainContainer = styled.div`
display: flex;
@@ -34,8 +35,10 @@ export const EventRowMainObject = ({
labelIdentifierValue,
event,
eventAction,
+ eventTypeLabel,
mainObjectMetadataItem,
- createdAt,
+ happensAt,
+ hasRenderer,
}: EventRowMainObjectProps) => {
switch (eventAction) {
case 'created': {
@@ -44,10 +47,12 @@ export const EventRowMainObject = ({
<StyledRowContainer>
<StyledRow>
<EventRowItem>{labelIdentifierValue}</EventRowItem>
- <EventRowItem variant="action">{t`was created by`}</EventRowItem>
+ <EventRowItem variant="action">
+ {eventTypeLabel ?? t`was created by`}
+ </EventRowItem>
<EventRowItem>{authorFullName}</EventRowItem>
</StyledRow>
- <EventRowDate createdAt={createdAt} />
+ <EventRowDate happensAt={happensAt} />
</StyledRowContainer>
</StyledMainContainer>
);
@@ -58,8 +63,10 @@ export const EventRowMainObject = ({
authorFullName={authorFullName}
labelIdentifierValue={labelIdentifierValue}
event={event}
+ eventTypeLabel={eventTypeLabel}
mainObjectMetadataItem={mainObjectMetadataItem}
- createdAt={createdAt}
+ happensAt={happensAt}
+ hasRenderer={hasRenderer}
/>
);
}
@@ -69,10 +76,12 @@ export const EventRowMainObject = ({
<StyledRowContainer>
<StyledRow>
<EventRowItem>{labelIdentifierValue}</EventRowItem>
- <EventRowItem variant="action">{t`was deleted by`}</EventRowItem>
+ <EventRowItem variant="action">
+ {eventTypeLabel ?? t`was deleted by`}
+ </EventRowItem>
<EventRowItem>{authorFullName}</EventRowItem>
</StyledRow>
- <EventRowDate createdAt={createdAt} />
+ <EventRowDate happensAt={happensAt} />
</StyledRowContainer>
</StyledMainContainer>
);
@@ -83,15 +92,33 @@ export const EventRowMainObject = ({
<StyledRowContainer>
<StyledRow>
<EventRowItem>{labelIdentifierValue}</EventRowItem>
- <EventRowItem variant="action">{t`was restored by`}</EventRowItem>
+ <EventRowItem variant="action">
+ {eventTypeLabel ?? t`was restored by`}
+ </EventRowItem>
<EventRowItem>{authorFullName}</EventRowItem>
</StyledRow>
- <EventRowDate createdAt={createdAt} />
+ <EventRowDate happensAt={happensAt} />
+ </StyledRowContainer>
+ </StyledMainContainer>
+ );
+ }
+ default: {
+ if (!isDefined(eventTypeLabel)) {
+ return null;
+ }
+
+ return (
+ <StyledMainContainer>
+ <StyledRowContainer>
+ <StyledRow>
+ <EventRowItem>{authorFullName}</EventRowItem>
+ <EventRowItem variant="action">{eventTypeLabel}</EventRowItem>
+ <EventRowItem>{labelIdentifierValue}</EventRowItem>
+ </StyledRow>
+ <EventRowDate happensAt={happensAt} />
</StyledRowContainer>
</StyledMainContainer>
);
}
- default:
- return null;
}
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx
index ab36d0e0464..9ae4e0f002a 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx
@@ -15,8 +15,10 @@ type EventRowMainObjectUpdatedProps = {
mainObjectMetadataItem: EnrichedObjectMetadataItem;
authorFullName: string;
labelIdentifierValue: string;
+ eventTypeLabel?: string;
event: Pick<TimelineActivity, 'id' | 'properties'>;
- createdAt?: string;
+ happensAt?: string;
+ hasRenderer?: boolean;
};
const StyledRowContainer = styled.div`
@@ -43,19 +45,33 @@ const StyledEventRowMainObjectUpdatedContainer = styled.div`
export const EventRowMainObjectUpdated = ({
authorFullName,
labelIdentifierValue,
+ eventTypeLabel,
event,
mainObjectMetadataItem,
- createdAt,
+ happensAt,
+ hasRenderer,
}: EventRowMainObjectUpdatedProps) => {
const { t } = useLingui();
- const diff: Record<string, { before: any; after: any }> =
- event.properties?.diff;
+ const diff = event.properties.diff ?? {};
const [isOpen, setIsOpen] = useState(true);
const diffEntries = Object.entries(diff);
if (diffEntries.length === 0) {
- throw new Error('Cannot render update description without changes');
+ return (
+ <StyledEventRowMainObjectUpdatedContainer>
+ <StyledRowContainer>
+ <StyledRow>
+ <EventRowItem>{authorFullName}</EventRowItem>
+ <EventRowItem variant="action">
+ {eventTypeLabel ?? t`updated`}
+ </EventRowItem>
+ <EventRowItem>{labelIdentifierValue}</EventRowItem>
+ </StyledRow>
+ <EventRowDate happensAt={happensAt} />
+ </StyledRowContainer>
+ </StyledEventRowMainObjectUpdatedContainer>
+ );
}
const fieldCount = diffEntries.length;
@@ -66,7 +82,9 @@ export const EventRowMainObjectUpdated = ({
<StyledRowContainer>
<StyledRow>
<EventRowItem>{authorFullName}</EventRowItem>
- {t`updated`}
+ <EventRowItem variant="action">
+ {eventTypeLabel ?? t`updated`}
+ </EventRowItem>
{diffEntries.length === 1 && (
<EventFieldDiffContainer
mainObjectMetadataItem={mainObjectMetadataItem}
@@ -78,13 +96,15 @@ export const EventRowMainObjectUpdated = ({
{diffEntries.length > 1 && (
<>
<span>{t`${fieldCount} fields on ${recordLabel}`}</span>
- <EventCardToggleButton isOpen={isOpen} setIsOpen={setIsOpen} />
+ {!hasRenderer && (
+ <EventCardToggleButton isOpen={isOpen} setIsOpen={setIsOpen} />
+ )}
</>
)}
</StyledRow>
- <EventRowDate createdAt={createdAt} />
+ <EventRowDate happensAt={happensAt} />
</StyledRowContainer>
- {diffEntries.length > 1 && (
+ {diffEntries.length > 1 && !hasRenderer && (
<EventCard isOpen={isOpen}>
{diffEntries.map(([diffKey, diffValue]) => (
<EventFieldDiffContainer
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
index 699a9a60d89..e6ad3ccb609 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessage.tsx
@@ -1,20 +1,18 @@
+import { CombinedGraphQLErrors } from '@apollo/client/errors';
import { styled } from '@linaria/react';
+import { Trans } from '@lingui/react/macro';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { isDefined, isFieldValueRestricted } from 'twenty-shared/utils';
+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
import { type EmailThreadMessage } from '@/activities/emails/types/EmailThreadMessage';
-import { EventCardMessageBodyNotShared } from '@/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared';
import { EventCardMessageForbidden } from '@/activities/timeline-activities/rows/message/components/EventCardMessageForbidden';
-import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
-import { CombinedGraphQLErrors } from '@apollo/client/errors';
-import { isDefined } from 'twenty-shared/utils';
-import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
-const StyledEventCardMessageContainer = styled.div<{ canOpen?: boolean }>`
- cursor: ${({ canOpen }) => (canOpen ? 'pointer' : 'not-allowed')};
+const StyledEventCardMessageContainer = styled.div`
+ cursor: pointer;
display: flex;
flex-direction: column;
max-width: 380px;
@@ -61,7 +59,6 @@ export const EventCardMessage = ({
messageId: string;
authorFullName: string;
}) => {
- const { t } = useLingui();
const { openRecordInSidePanel } = useOpenRecordInSidePanel();
const {
@@ -85,54 +82,47 @@ export const EventCardMessage = ({
if (isDefined(error)) {
if (CombinedGraphQLErrors.is(error)) {
- const shouldHideMessageContent = error.errors.some(
- (e) => e.extensions?.code === 'FORBIDDEN',
- );
-
- if (shouldHideMessageContent) {
+ if (
+ error.errors.some(
+ (graphQLError) => graphQLError.extensions?.code === 'FORBIDDEN',
+ )
+ ) {
return (
<EventCardMessageForbidden notSharedByFullName={authorFullName} />
);
}
- const shouldHandleNotFound = error.errors.some(
- (e) => e.extensions?.code === 'NOT_FOUND',
- );
-
- if (shouldHandleNotFound) {
- return (
- <div>
- <Trans>Message not found</Trans>
- </div>
- );
+ if (
+ error.errors.some(
+ (graphQLError) => graphQLError.extensions?.code === 'NOT_FOUND',
+ )
+ ) {
+ return <Trans>Message not found</Trans>;
}
}
- return (
- <div>
- <Trans>Error loading message</Trans>
- </div>
- );
+ return <Trans>Error loading message</Trans>;
}
- if (loading || !isDefined(message)) {
- return (
- <div>
- <Trans>Loading...</Trans>
- </div>
- );
+ if (loading) {
+ return <Trans>Loading...</Trans>;
}
- const messageParticipantHandles = message.messageParticipants
+ if (!isDefined(message)) {
+ return <EventCardMessageForbidden notSharedByFullName={authorFullName} />;
+ }
+
+ if ([message.subject, message.text].some(isFieldValueRestricted)) {
+ return <EventCardMessageForbidden notSharedByFullName={authorFullName} />;
+ }
+
+ const participantHandles = message.messageParticipants
.map((participant) => participant.handle)
.filter((handle) => isDefined(handle) && handle !== '')
.join(', ');
- const canOpen =
- message.subject !== FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED;
-
const handleClick = () => {
- if (canOpen && isDefined(message.messageThreadId)) {
+ if (isDefined(message.messageThreadId)) {
openRecordInSidePanel({
recordId: message.messageThreadId,
objectNameSingular: CoreObjectNameSingular.MessageThread,
@@ -141,24 +131,15 @@ export const EventCardMessage = ({
};
return (
- <StyledEventCardMessageContainer canOpen={canOpen} onClick={handleClick}>
+ <StyledEventCardMessageContainer onClick={handleClick}>
<StyledEmailContent>
<StyledEmailTop>
- <StyledEmailTitle>
- {message.subject !==
- FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED
- ? message.subject
- : t`Subject not shared`}
- </StyledEmailTitle>
+ <StyledEmailTitle>{message.subject}</StyledEmailTitle>
<StyledEmailParticipants>
- <OverflowingTextWithTooltip text={messageParticipantHandles} />
+ <OverflowingTextWithTooltip text={participantHandles} />
</StyledEmailParticipants>
</StyledEmailTop>
- {message.text !== FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED ? (
- <StyledEmailBody>{message.text}</StyledEmailBody>
- ) : (
- <EventCardMessageBodyNotShared notSharedByFullName={authorFullName} />
- )}
+ <StyledEmailBody>{message.text}</StyledEmailBody>
</StyledEmailContent>
</StyledEventCardMessageContainer>
);
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx
index c33753f30f7..639590e1d26 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageBodyNotShared.tsx
@@ -11,10 +11,8 @@ const StyledEmailBodyNotSharedContainer = styled.div`
color: ${themeCssVariables.font.color.light};
display: flex;
flex-direction: column;
-
font-size: ${themeCssVariables.font.size.sm};
font-weight: ${themeCssVariables.font.weight.medium};
-
gap: ${themeCssVariables.spacing[3]};
height: 80px;
justify-content: center;
@@ -39,17 +37,15 @@ export const EventCardMessageBodyNotShared = ({
notSharedByFullName,
}: {
notSharedByFullName: string;
-}) => {
- return (
- <StyledEmailBodyNotSharedContainer>
- <StyledEmailBodyNotShared>
- <StyledEmailBodyNotSharedIconContainer>
- <IconLock />
- </StyledEmailBodyNotSharedIconContainer>
- <span>
- <Trans>Not shared by {notSharedByFullName}</Trans>
- </span>
- </StyledEmailBodyNotShared>
- </StyledEmailBodyNotSharedContainer>
- );
-};
+}) => (
+ <StyledEmailBodyNotSharedContainer>
+ <StyledEmailBodyNotShared>
+ <StyledEmailBodyNotSharedIconContainer>
+ <IconLock />
+ </StyledEmailBodyNotSharedIconContainer>
+ <span>
+ <Trans>Not shared by {notSharedByFullName}</Trans>
+ </span>
+ </StyledEmailBodyNotShared>
+ </StyledEmailBodyNotSharedContainer>
+);
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageForbidden.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageForbidden.tsx
index 7bd5fa288ec..42a179059c0 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageForbidden.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventCardMessageForbidden.tsx
@@ -29,17 +29,15 @@ export const EventCardMessageForbidden = ({
notSharedByFullName,
}: {
notSharedByFullName: string;
-}) => {
- return (
- <StyledEventCardMessageContainer>
- <StyledEmailContent>
- <StyledEmailTitle>
- <Trans>Subject not shared</Trans>
- </StyledEmailTitle>
- <EventCardMessageBodyNotShared
- notSharedByFullName={notSharedByFullName}
- />
- </StyledEmailContent>
- </StyledEventCardMessageContainer>
- );
-};
+}) => (
+ <StyledEventCardMessageContainer>
+ <StyledEmailContent>
+ <StyledEmailTitle>
+ <Trans>Subject not shared</Trans>
+ </StyledEmailTitle>
+ <EventCardMessageBodyNotShared
+ notSharedByFullName={notSharedByFullName}
+ />
+ </StyledEmailContent>
+ </StyledEventCardMessageContainer>
+);
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventRowMessage.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventRowMessage.tsx
deleted file mode 100644
index 3e4362421ee..00000000000
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/EventRowMessage.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { styled } from '@linaria/react';
-import { t } from '@lingui/core/macro';
-import { useState } from 'react';
-
-import { EventCard } from '@/activities/timeline-activities/rows/components/EventCard';
-import { EventCardToggleButton } from '@/activities/timeline-activities/rows/components/EventCardToggleButton';
-import { type EventRowDynamicComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';
-import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';
-import { EventCardMessage } from '@/activities/timeline-activities/rows/message/components/EventCardMessage';
-import { isTimelineActivityWithLinkedRecord } from '@/activities/timeline-activities/types/TimelineActivity';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-type EventRowMessageProps = EventRowDynamicComponentProps;
-
-const StyledEventRowMessageContainer = styled.div`
- display: flex;
- flex-direction: column;
- gap: ${themeCssVariables.spacing[1]};
-`;
-
-const StyledRowContainer = styled.div`
- display: flex;
- flex-direction: row;
- gap: ${themeCssVariables.spacing[1]};
-`;
-
-export const EventRowMessage = ({
- event,
- eventAction,
- authorFullName,
- labelIdentifierValue,
-}: EventRowMessageProps) => {
- const [isOpen, setIsOpen] = useState(false);
-
- if (eventAction !== 'linked') {
- throw new Error('Invalid event action for message event type.');
- }
-
- return (
- <StyledEventRowMessageContainer>
- <StyledRowContainer>
- <EventRowItem>{authorFullName}</EventRowItem>
- <EventRowItem variant="action">{t`linked an email with`}</EventRowItem>
- <EventRowItem>{labelIdentifierValue}</EventRowItem>
- <EventCardToggleButton isOpen={isOpen} setIsOpen={setIsOpen} />
- </StyledRowContainer>
- <EventCard isOpen={isOpen}>
- {isTimelineActivityWithLinkedRecord(event) && (
- <EventCardMessage
- messageId={event.linkedRecordId}
- authorFullName={authorFullName}
- />
- )}
- </EventCard>
- </StyledEventRowMessageContainer>
- );
-};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx
index 3b0f2004098..311d55bef96 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx
@@ -1,14 +1,14 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { HttpResponse, graphql } from 'msw';
import { within } from 'storybook/test';
+import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
+import { ComponentDecorator } from 'twenty-ui/testing';
import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext';
import { EventCardMessage } from '@/activities/timeline-activities/rows/message/components/EventCardMessage';
-import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
-import { ComponentDecorator } from 'twenty-ui/testing';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
const meta: Meta<typeof EventCardMessage> = {
title: 'Modules/TimelineActivities/Rows/Message/EventCardMessage',
@@ -18,13 +18,11 @@ const meta: Meta<typeof EventCardMessage> = {
ComponentDecorator,
ObjectMetadataItemsDecorator,
SnackBarDecorator,
- (Story) => {
- return (
- <TimelineActivityContext.Provider value={{ recordId: 'mock-id' }}>
- <Story />
- </TimelineActivityContext.Provider>
- );
- },
+ (Story) => (
+ <TimelineActivityContext.Provider value={{ recordId: 'mock-id' }}>
+ <Story />
+ </TimelineActivityContext.Provider>
+ ),
],
};
@@ -37,15 +35,13 @@ export const Default: Story = {
authorFullName: 'John Doe',
},
play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
-
- await canvas.findByText('Mock title');
+ await within(canvasElement).findByText('Mock title');
},
parameters: {
msw: {
handlers: [
- graphql.query('FindOneMessage', () => {
- return HttpResponse.json({
+ graphql.query('FindOneMessage', () =>
+ HttpResponse.json({
data: {
message: {
id: '1',
@@ -54,8 +50,8 @@ export const Default: Story = {
messageParticipants: [],
},
},
- });
- }),
+ }),
+ ),
],
},
},
@@ -67,15 +63,13 @@ export const NotShared: Story = {
authorFullName: 'John Doe',
},
play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
-
- await canvas.findByText(`Subject not shared`);
+ await within(canvasElement).findByText('Subject not shared');
},
parameters: {
msw: {
handlers: [
- graphql.query('FindOneMessage', () => {
- return HttpResponse.json({
+ graphql.query('FindOneMessage', () =>
+ HttpResponse.json({
data: {
message: {
id: '1',
@@ -84,8 +78,8 @@ export const NotShared: Story = {
messageParticipants: [],
},
},
- });
- }),
+ }),
+ ),
],
},
},
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__tests__/EventCardMessage.test.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__tests__/EventCardMessage.test.tsx
new file mode 100644
index 00000000000..ebd233e8b63
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__tests__/EventCardMessage.test.tsx
@@ -0,0 +1,81 @@
+import { CombinedGraphQLErrors } from '@apollo/client/errors';
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { render, screen } from '@testing-library/react';
+import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';
+
+import { EventCardMessage } from '@/activities/timeline-activities/rows/message/components/EventCardMessage';
+import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+
+jest.mock('@/object-record/hooks/useFindOneRecord', () => ({
+ useFindOneRecord: jest.fn(),
+}));
+jest.mock('@/side-panel/hooks/useOpenRecordInSidePanel', () => ({
+ useOpenRecordInSidePanel: () => ({ openRecordInSidePanel: jest.fn() }),
+}));
+
+const renderCard = () =>
+ render(
+ <I18nProvider i18n={i18n}>
+ <EventCardMessage messageId="message-id" authorFullName="Ada Lovelace" />
+ </I18nProvider>,
+ );
+
+describe('EventCardMessage', () => {
+ it('does not render fields masked by metadata visibility', () => {
+ jest.mocked(useFindOneRecord).mockReturnValue({
+ record: {
+ id: 'message-id',
+ subject: FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED,
+ text: FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED,
+ messageThreadId: 'thread-id',
+ messageParticipants: [{ handle: '[email protected]' }],
+ },
+ loading: false,
+ error: undefined,
+ } as never);
+
+ renderCard();
+
+ expect(screen.getByText('Subject not shared')).toBeInTheDocument();
+ expect(screen.getByText('Not shared by Ada Lovelace')).toBeInTheDocument();
+ expect(
+ screen.queryByText(FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED),
+ ).not.toBeInTheDocument();
+ expect(screen.queryByText('[email protected]')).not.toBeInTheDocument();
+ });
+
+ it('renders the not-shared state when record access is forbidden', () => {
+ jest.mocked(useFindOneRecord).mockReturnValue({
+ record: undefined,
+ loading: false,
+ error: new CombinedGraphQLErrors({
+ data: null,
+ errors: [
+ {
+ message: 'Forbidden',
+ extensions: { code: 'FORBIDDEN' },
+ },
+ ],
+ }),
+ } as never);
+
+ renderCard();
+
+ expect(screen.getByText('Subject not shared')).toBeInTheDocument();
+ expect(screen.getByText('Not shared by Ada Lovelace')).toBeInTheDocument();
+ });
+
+ it('fails closed when a hidden record is omitted without an error', () => {
+ jest.mocked(useFindOneRecord).mockReturnValue({
+ record: undefined,
+ loading: false,
+ error: undefined,
+ } as never);
+
+ renderCard();
+
+ expect(screen.getByText('Subject not shared')).toBeInTheDocument();
+ expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/states/timelineActivityTypeIdsFilterFamilyState.ts b/packages/twenty-front/src/modules/activities/timeline-activities/states/timelineActivityTypeUniversalIdentifiersFilterFamilyState.ts
similarity index 51%
rename from packages/twenty-front/src/modules/activities/timeline-activities/states/timelineActivityTypeIdsFilterFamilyState.ts
rename to packages/twenty-front/src/modules/activities/timeline-activities/states/timelineActivityTypeUniversalIdentifiersFilterFamilyState.ts
index 61b198cd362..e7476280668 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/states/timelineActivityTypeIdsFilterFamilyState.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/states/timelineActivityTypeUniversalIdentifiersFilterFamilyState.ts
@@ -2,10 +2,8 @@ import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAt
// Keyed by target record id so each record's timeline keeps its own selection.
// An empty selection means no filter rather than nothing to show.
-export const timelineActivityTypeIdsFilterFamilyState = createAtomFamilyState<
- string[],
- string
->({
- key: 'activities/timelineActivityTypeIdsFilterFamilyState',
- defaultValue: [],
-});
+export const timelineActivityTypeUniversalIdentifiersFilterFamilyState =
+ createAtomFamilyState<string[], string>({
+ key: 'activities/timelineActivityTypeUniversalIdentifiersFilterFamilyState',
+ defaultValue: [],
+ });
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/types/FilterableTimelineActivity.ts b/packages/twenty-front/src/modules/activities/timeline-activities/types/FilterableTimelineActivity.ts
index 4fed1d28d29..c81ea441ae5 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/types/FilterableTimelineActivity.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/types/FilterableTimelineActivity.ts
@@ -1,12 +1,12 @@
import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';
-// The read-time filters and the action lookup touch these fields only, so they
-// take this rather than a whole activity and force casts on every fixture. Both
-// nullable fields are optional because every reader guards them with isDefined.
export type FilterableTimelineActivity = Pick<TimelineActivity, 'properties'> &
Partial<
Pick<
TimelineActivity,
- 'linkedObjectMetadataId' | 'name' | 'timelineActivityTypeId'
+ | 'name'
+ | 'linkedObjectMetadataId'
+ | 'timelineActivityTypeId'
+ | 'timelineActivityTypeSnapshot'
>
>;
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivity.ts b/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivity.ts
index fcefae2ca81..f5d34db1519 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivity.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivity.ts
@@ -1,29 +1,33 @@
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
import { isDefined } from 'twenty-shared/utils';
import { type WorkspaceMember } from '~/generated-metadata/graphql';
export type TimelineActivity = {
id: string;
createdAt: string;
+ happensAt: string;
updatedAt: string;
deletedAt: string | null;
workspaceMemberId: string;
workspaceMember: WorkspaceMember;
- properties: any;
+ properties: Record<string, unknown> & {
+ diff?: Record<string, { before: unknown; after: unknown }>;
+ };
name: string | null;
timelineActivityTypeId: string | null;
- linkedRecordCachedName: string;
+ timelineActivityTypeSnapshot: TimelineActivityTypeSnapshot | null;
linkedRecordId: string | null;
linkedObjectMetadataId: string | null;
__typename: 'TimelineActivity';
-} & Record<string, any>;
+} & Record<string, unknown>;
-export type TimelineActivityWithRecord = TimelineActivity & {
+export type TimelineActivityWithLinkedRecord = TimelineActivity & {
linkedRecordId: string;
linkedObjectMetadataId: string;
};
export const isTimelineActivityWithLinkedRecord = (
timelineActivity: TimelineActivity,
-): timelineActivity is TimelineActivityWithRecord =>
+): timelineActivity is TimelineActivityWithLinkedRecord =>
isDefined(timelineActivity.linkedObjectMetadataId) &&
isDefined(timelineActivity.linkedRecordId);
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivityType.ts b/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivityType.ts
index e9ff4b8681d..17ba5c59da9 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivityType.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivityType.ts
@@ -1,14 +1,5 @@
-import {
- type TimelineActivityAction,
- type TimelineActivityRenderer,
-} from 'twenty-shared/timeline';
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
-export type TimelineActivityType = {
- id: string;
- name: string;
- label: string;
- action: TimelineActivityAction | null;
- icon: string | null;
- renderer: TimelineActivityRenderer | null;
- objectUniversalIdentifier: string | null;
+export type TimelineActivityType = TimelineActivityTypeSnapshot & {
+ isActive?: boolean;
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivityTypeMaps.ts b/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivityTypeMaps.ts
new file mode 100644
index 00000000000..b2573003afb
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/types/TimelineActivityTypeMaps.ts
@@ -0,0 +1,6 @@
+import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+
+export type TimelineActivityTypeMaps = {
+ byId: ReadonlyMap<string, TimelineActivityType>;
+ byUniversalIdentifier: ReadonlyMap<string, TimelineActivityType>;
+};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/filterOutInvalidTimelineActivities.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/filterOutInvalidTimelineActivities.test.ts
index 8ea4309cbe3..0cbae35912d 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/filterOutInvalidTimelineActivities.test.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/filterOutInvalidTimelineActivities.test.ts
@@ -1,8 +1,11 @@
import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
import { filterOutInvalidTimelineActivities } from '@/activities/timeline-activities/utils/filterOutInvalidTimelineActivities';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+type TestTimelineActivity = FilterableTimelineActivity & { id: string };
+
const mainObjectMetadataItem = {
nameSingular: 'company',
namePlural: 'companies',
@@ -39,51 +42,64 @@ const timelineActivityTypeById = new Map<string, TimelineActivityType>([
UPDATED_TYPE_ID,
{
id: UPDATED_TYPE_ID,
+ universalIdentifier: UPDATED_TYPE_ID,
name: 'recordUpdated',
label: 'updated',
action: 'updated',
icon: null,
- renderer: null,
objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
},
],
[
LINKED_TYPE_ID,
{
id: LINKED_TYPE_ID,
+ universalIdentifier: LINKED_TYPE_ID,
name: 'recordLinked',
label: 'was linked by',
action: 'linked',
icon: null,
- renderer: null,
objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
},
],
[
NOTE_UPDATED_TYPE_ID,
{
id: NOTE_UPDATED_TYPE_ID,
+ universalIdentifier: NOTE_UPDATED_TYPE_ID,
name: 'noteUpdated',
label: 'updated a related note',
action: 'updated',
icon: null,
- renderer: 'activity',
objectUniversalIdentifier: NOTE_OBJECT_UNIVERSAL_IDENTIFIER,
+ frontComponentUniversalIdentifier: null,
},
],
]);
-const filter = (events: FilterableTimelineActivity[]) =>
+const timelineActivityTypeMaps: TimelineActivityTypeMaps = {
+ byId: timelineActivityTypeById,
+ byUniversalIdentifier: new Map(
+ [...timelineActivityTypeById.values()].map((timelineActivityType) => [
+ timelineActivityType.universalIdentifier,
+ timelineActivityType,
+ ]),
+ ),
+};
+
+const filter = (events: TestTimelineActivity[]) =>
filterOutInvalidTimelineActivities(
events,
'company',
[mainObjectMetadataItem, noteObjectMetadataItem, taskObjectMetadataItem],
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
);
describe('filterOutInvalidTimelineActivities', () => {
it('keeps update diffs as-is and trims fields not in the readable fields', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{
id: '1',
timelineActivityTypeId: UPDATED_TYPE_ID,
@@ -128,7 +144,7 @@ describe('filterOutInvalidTimelineActivities', () => {
});
it('drops update events whose diff has no readable fields', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{
id: '1',
timelineActivityTypeId: UPDATED_TYPE_ID,
@@ -142,7 +158,7 @@ describe('filterOutInvalidTimelineActivities', () => {
});
it('drops update events that have no diff', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{ id: '1', timelineActivityTypeId: UPDATED_TYPE_ID, properties: {} },
];
@@ -150,7 +166,7 @@ describe('filterOutInvalidTimelineActivities', () => {
});
it('keeps non-update events that have no diff', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{ id: '1', timelineActivityTypeId: LINKED_TYPE_ID, properties: {} },
{ id: '2', timelineActivityTypeId: LINKED_TYPE_ID, properties: {} },
];
@@ -159,7 +175,7 @@ describe('filterOutInvalidTimelineActivities', () => {
});
it('keeps linked note/task rows that carry no diff', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{
id: '1',
timelineActivityTypeId: UPDATED_TYPE_ID,
@@ -178,7 +194,7 @@ describe('filterOutInvalidTimelineActivities', () => {
});
it('validates linked note diffs against the note readable fields', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{
id: '1',
timelineActivityTypeId: UPDATED_TYPE_ID,
@@ -203,7 +219,7 @@ describe('filterOutInvalidTimelineActivities', () => {
});
it('resolves the linked object from the type for a historical row', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{
id: '1',
timelineActivityTypeId: NOTE_UPDATED_TYPE_ID,
@@ -227,13 +243,14 @@ describe('filterOutInvalidTimelineActivities', () => {
]);
});
- it('resolves the linked object from name for a row written by an old pod', () => {
- const events = [
+ it('falls back to the type universal identifier after an object reinstall', () => {
+ const events: TestTimelineActivity[] = [
{
id: '1',
- timelineActivityTypeId: null,
- linkedObjectMetadataId: null,
- name: 'linked-note.updated',
+ timelineActivityTypeId: NOTE_UPDATED_TYPE_ID,
+ timelineActivityTypeSnapshot:
+ timelineActivityTypeMaps.byId.get(NOTE_UPDATED_TYPE_ID),
+ linkedObjectMetadataId: 'stale-installation-id',
properties: {
diff: {
title: { before: 'a', after: 'b' },
@@ -245,17 +262,14 @@ describe('filterOutInvalidTimelineActivities', () => {
expect(filter(events)).toEqual([
{
- id: '1',
- timelineActivityTypeId: null,
- linkedObjectMetadataId: null,
- name: 'linked-note.updated',
+ ...events[0],
properties: { diff: { title: { before: 'a', after: 'b' } } },
},
]);
});
it('drops linked note updates whose diff has no readable note fields', () => {
- const events = [
+ const events: TestTimelineActivity[] = [
{
id: '1',
timelineActivityTypeId: UPDATED_TYPE_ID,
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityAction.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityAction.test.ts
index 6c1aea3ea8a..c247749b202 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityAction.test.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityAction.test.ts
@@ -1,22 +1,26 @@
-import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
import { getTimelineActivityAction } from '@/activities/timeline-activities/utils/getTimelineActivityAction';
const UPDATED_TYPE_ID = '20202020-0000-4000-8000-000000000001';
-const timelineActivityTypeById = new Map<string, TimelineActivityType>([
- [
- UPDATED_TYPE_ID,
- {
- id: UPDATED_TYPE_ID,
- name: 'recordUpdated',
- label: 'updated',
- action: 'updated',
- icon: null,
- renderer: null,
- objectUniversalIdentifier: null,
- },
- ],
-]);
+const timelineActivityTypeMaps: TimelineActivityTypeMaps = {
+ byId: new Map([
+ [
+ UPDATED_TYPE_ID,
+ {
+ id: UPDATED_TYPE_ID,
+ universalIdentifier: UPDATED_TYPE_ID,
+ name: 'recordUpdated',
+ label: 'updated',
+ action: 'updated',
+ icon: null,
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ },
+ ],
+ ]),
+ byUniversalIdentifier: new Map(),
+};
describe('getTimelineActivityAction', () => {
it('reads the action from the activity type', () => {
@@ -24,33 +28,28 @@ describe('getTimelineActivityAction', () => {
getTimelineActivityAction(
{
timelineActivityTypeId: UPDATED_TYPE_ID,
- name: 'company.created',
properties: {},
},
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
),
).toBe('updated');
});
- it('falls back to the deprecated name for a row written by an old pod', () => {
+ it('returns null when the type does not resolve', () => {
expect(
getTimelineActivityAction(
- {
- timelineActivityTypeId: null,
- name: 'company.created',
- properties: {},
- },
- timelineActivityTypeById,
+ { timelineActivityTypeId: 'missing', properties: {} },
+ timelineActivityTypeMaps,
),
- ).toBe('created');
+ ).toBeNull();
});
- it('returns null when neither representation resolves', () => {
+ it('falls back to the legacy name for a row written during a rolling upgrade', () => {
expect(
getTimelineActivityAction(
- { timelineActivityTypeId: null, name: null, properties: {} },
- timelineActivityTypeById,
+ { name: 'company.updated', properties: {} },
+ timelineActivityTypeMaps,
),
- ).toBeNull();
+ ).toBe('updated');
});
});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityRecordGqlFields.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityRecordGqlFields.test.ts
index ca5e6d8b848..b2956095a44 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityRecordGqlFields.test.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityRecordGqlFields.test.ts
@@ -32,9 +32,9 @@ describe('getTimelineActivityRecordGqlFields', () => {
properties: true,
linkedRecordId: true,
linkedObjectMetadataId: true,
- linkedRecordCachedName: true,
workspaceMemberId: true,
workspaceMember: expect.any(Object),
});
+ expect(recordGqlFields.linkedRecordCachedName).toBeUndefined();
});
});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityType.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityType.test.ts
new file mode 100644
index 00000000000..4417704a330
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/getTimelineActivityType.test.ts
@@ -0,0 +1,109 @@
+import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
+import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
+import { getTimelineActivityType } from '@/activities/timeline-activities/utils/getTimelineActivityType';
+
+const TIMELINE_ACTIVITY_TYPE_ID = '00000000-0000-4000-8000-000000000001';
+const TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000002';
+const FRONT_COMPONENT_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000003';
+
+const liveTimelineActivityType: TimelineActivityType = {
+ id: TIMELINE_ACTIVITY_TYPE_ID,
+ universalIdentifier: TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER,
+ name: 'deploymentCompleted',
+ label: 'completed a deployment',
+ action: 'updated',
+ icon: 'IconRocket',
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+};
+
+const timelineActivity = {
+ properties: {},
+ timelineActivityTypeId: TIMELINE_ACTIVITY_TYPE_ID,
+ timelineActivityTypeSnapshot: {
+ id: TIMELINE_ACTIVITY_TYPE_ID,
+ universalIdentifier: TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER,
+ name: 'deploymentStarted',
+ label: 'started a deployment',
+ action: 'created',
+ icon: 'IconPlayerPlay',
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: FRONT_COMPONENT_UNIVERSAL_IDENTIFIER,
+ },
+} satisfies FilterableTimelineActivity;
+
+const getMaps = (
+ timelineActivityTypes: TimelineActivityType[],
+): TimelineActivityTypeMaps => ({
+ byId: new Map(
+ timelineActivityTypes.map((timelineActivityType) => [
+ timelineActivityType.id,
+ timelineActivityType,
+ ]),
+ ),
+ byUniversalIdentifier: new Map(
+ timelineActivityTypes.map((timelineActivityType) => [
+ timelineActivityType.universalIdentifier,
+ timelineActivityType,
+ ]),
+ ),
+});
+
+describe('getTimelineActivityType', () => {
+ it('uses snapshot semantics with live presentation', () => {
+ expect(
+ getTimelineActivityType(
+ timelineActivity,
+ getMaps([liveTimelineActivityType]),
+ ),
+ ).toEqual({
+ ...timelineActivity.timelineActivityTypeSnapshot,
+ id: liveTimelineActivityType.id,
+ name: liveTimelineActivityType.name,
+ label: liveTimelineActivityType.label,
+ icon: liveTimelineActivityType.icon,
+ frontComponentUniversalIdentifier:
+ liveTimelineActivityType.frontComponentUniversalIdentifier,
+ });
+ });
+
+ it('keeps rendering after the provider application is uninstalled', () => {
+ expect(getTimelineActivityType(timelineActivity, getMaps([]))).toEqual(
+ timelineActivity.timelineActivityTypeSnapshot,
+ );
+ });
+
+ it('finds live presentation after the application is reinstalled', () => {
+ const reinstalledTimelineActivityType = {
+ ...liveTimelineActivityType,
+ id: '00000000-0000-4000-8000-000000000004',
+ };
+
+ expect(
+ getTimelineActivityType(
+ timelineActivity,
+ getMaps([reinstalledTimelineActivityType]),
+ ),
+ ).toMatchObject({
+ id: reinstalledTimelineActivityType.id,
+ label: liveTimelineActivityType.label,
+ icon: liveTimelineActivityType.icon,
+ action: timelineActivity.timelineActivityTypeSnapshot.action,
+ });
+ });
+
+ it('reads live metadata for pre-snapshot typed rows', () => {
+ expect(
+ getTimelineActivityType(
+ {
+ properties: {},
+ timelineActivityTypeId: TIMELINE_ACTIVITY_TYPE_ID,
+ },
+ getMaps([liveTimelineActivityType]),
+ ),
+ ).toBe(liveTimelineActivityType);
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts
index 6048d4a1b6e..a619efad4b3 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts
@@ -6,6 +6,18 @@ const mockedTimelineActivities =
mockedTimelineActivityRecords as unknown as TimelineActivity[];
describe('groupEventsByMonth', () => {
+ it('groups an event by when it happened rather than when it was persisted', () => {
+ const [group] = groupEventsByMonth([
+ {
+ createdAt: '2026-03-01T00:00:00.000Z',
+ happensAt: '2026-02-01T00:00:00.000Z',
+ } as TimelineActivity,
+ ]);
+
+ expect(group.month).toBe(1);
+ expect(group.year).toBe(2026);
+ });
+
it('should group activities by month', () => {
const grouped = groupEventsByMonth(mockedTimelineActivities);
@@ -17,7 +29,7 @@ describe('groupEventsByMonth', () => {
for (const group of grouped) {
for (const item of group.items) {
- const date = new Date(item.createdAt);
+ const date = new Date(item.happensAt);
expect(date.getMonth()).toBe(group.month);
expect(date.getFullYear()).toBe(group.year);
}
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/keepTimelineActivitiesOfSelectedTypes.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/keepTimelineActivitiesOfSelectedTypes.test.ts
index a4b2715c4d7..79c8207b3cc 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/keepTimelineActivitiesOfSelectedTypes.test.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/keepTimelineActivitiesOfSelectedTypes.test.ts
@@ -1,9 +1,30 @@
import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
+import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
import { keepTimelineActivitiesOfSelectedTypes } from '@/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes';
const UPDATED_TYPE_ID = '20202020-0000-4000-8000-0000000update';
const LINKED_TYPE_ID = '20202020-0000-4000-8000-0000000linked';
+const buildTimelineActivityType = (id: string): TimelineActivityType => ({
+ id,
+ universalIdentifier: id,
+ name: id,
+ label: id,
+ action: 'updated',
+ icon: null,
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+});
+
+const timelineActivityTypeMaps: TimelineActivityTypeMaps = {
+ byId: new Map([
+ [UPDATED_TYPE_ID, buildTimelineActivityType(UPDATED_TYPE_ID)],
+ [LINKED_TYPE_ID, buildTimelineActivityType(LINKED_TYPE_ID)],
+ ]),
+ byUniversalIdentifier: new Map(),
+};
+
const updatedActivity = {
timelineActivityTypeId: UPDATED_TYPE_ID,
properties: {},
@@ -20,9 +41,13 @@ describe('keepTimelineActivitiesOfSelectedTypes', () => {
it('keeps everything when nothing is selected', () => {
const activities = [updatedActivity, linkedActivity, untypedActivity];
- expect(keepTimelineActivitiesOfSelectedTypes(activities, [])).toEqual(
- activities,
- );
+ expect(
+ keepTimelineActivitiesOfSelectedTypes(
+ activities,
+ [],
+ timelineActivityTypeMaps,
+ ),
+ ).toEqual(activities);
});
it('keeps only the activities carrying a selected type', () => {
@@ -30,6 +55,7 @@ describe('keepTimelineActivitiesOfSelectedTypes', () => {
keepTimelineActivitiesOfSelectedTypes(
[updatedActivity, linkedActivity, untypedActivity],
[LINKED_TYPE_ID],
+ timelineActivityTypeMaps,
),
).toEqual([linkedActivity]);
});
@@ -39,6 +65,7 @@ describe('keepTimelineActivitiesOfSelectedTypes', () => {
keepTimelineActivitiesOfSelectedTypes(
[updatedActivity, linkedActivity, untypedActivity],
[LINKED_TYPE_ID, UPDATED_TYPE_ID],
+ timelineActivityTypeMaps,
),
).toEqual([updatedActivity, linkedActivity]);
});
@@ -48,7 +75,33 @@ describe('keepTimelineActivitiesOfSelectedTypes', () => {
keepTimelineActivitiesOfSelectedTypes(
[untypedActivity],
[UPDATED_TYPE_ID],
+ timelineActivityTypeMaps,
),
).toEqual([]);
});
+
+ it('matches historical activities after a type reinstall', () => {
+ const reinstalledType = {
+ ...buildTimelineActivityType('new-installation-id'),
+ universalIdentifier: UPDATED_TYPE_ID,
+ };
+ const historicalActivity = {
+ timelineActivityTypeId: UPDATED_TYPE_ID,
+ timelineActivityTypeSnapshot: buildTimelineActivityType(UPDATED_TYPE_ID),
+ properties: {},
+ } satisfies FilterableTimelineActivity;
+
+ expect(
+ keepTimelineActivitiesOfSelectedTypes(
+ [historicalActivity],
+ [reinstalledType.universalIdentifier],
+ {
+ byId: new Map([[reinstalledType.id, reinstalledType]]),
+ byUniversalIdentifier: new Map([
+ [reinstalledType.universalIdentifier, reinstalledType],
+ ]),
+ },
+ ),
+ ).toEqual([historicalActivity]);
+ });
});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/filterOutInvalidTimelineActivities.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/filterOutInvalidTimelineActivities.ts
index 567a46389f7..6f570e075ea 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/filterOutInvalidTimelineActivities.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/filterOutInvalidTimelineActivities.ts
@@ -1,5 +1,5 @@
import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
-import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
import { findFieldMetadataItemByDiffKey } from '@/activities/timeline-activities/utils/findFieldMetadataItemByDiffKey';
import { getTimelineActivityAction } from '@/activities/timeline-activities/utils/getTimelineActivityAction';
import { getTimelineActivityLinkedObjectMetadataItem } from '@/activities/timeline-activities/utils/getTimelineActivityLinkedObjectMetadataItem';
@@ -38,7 +38,7 @@ export const filterOutInvalidTimelineActivities = <
timelineActivities: TTimelineActivity[],
mainObjectSingularName: string,
objectMetadataItems: EnrichedObjectMetadataItem[],
- timelineActivityTypeById: Map<string, TimelineActivityType>,
+ timelineActivityTypeMaps: TimelineActivityTypeMaps,
): TTimelineActivity[] => {
const mainObjectMetadataItem = objectMetadataItems.find(
(objectMetadataItem) =>
@@ -54,13 +54,13 @@ export const filterOutInvalidTimelineActivities = <
const linkedObjectMetadataItem =
getTimelineActivityLinkedObjectMetadataItem({
timelineActivity,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
objectMetadataItems,
});
const action = getTimelineActivityAction(
timelineActivity,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
);
if (isDefined(linkedObjectMetadataItem)) {
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityAction.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityAction.ts
index 13bcd6a991b..02af7ceb23c 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityAction.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityAction.ts
@@ -1,5 +1,5 @@
import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
-import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
import { getTimelineActivityType } from '@/activities/timeline-activities/utils/getTimelineActivityType';
import {
parseTimelineActivityAction,
@@ -9,17 +9,19 @@ import { isDefined } from 'twenty-shared/utils';
export const getTimelineActivityAction = (
timelineActivity: FilterableTimelineActivity,
- timelineActivityTypeById: Map<string, TimelineActivityType>,
+ timelineActivityTypeMaps: TimelineActivityTypeMaps,
): TimelineActivityAction | null => {
const timelineActivityType = getTimelineActivityType(
timelineActivity,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
);
if (isDefined(timelineActivityType)) {
return timelineActivityType.action;
}
+ // A 2.33 pod can create a name-only row after the one-time 2.34 backfill
+ // while both versions overlap. This fallback disappears with the 2.35 drop.
return isDefined(timelineActivity.name)
? parseTimelineActivityAction(timelineActivity.name)
: null;
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityLinkedObjectMetadataItem.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityLinkedObjectMetadataItem.ts
index a87ac773999..1399f228a0a 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityLinkedObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityLinkedObjectMetadataItem.ts
@@ -1,28 +1,32 @@
import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
-import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
import { getTimelineActivityType } from '@/activities/timeline-activities/utils/getTimelineActivityType';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { isDefined } from 'twenty-shared/utils';
export const getTimelineActivityLinkedObjectMetadataItem = ({
timelineActivity,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
objectMetadataItems,
}: {
timelineActivity: FilterableTimelineActivity;
- timelineActivityTypeById: Map<string, TimelineActivityType>;
+ timelineActivityTypeMaps: TimelineActivityTypeMaps;
objectMetadataItems: EnrichedObjectMetadataItem[];
}): EnrichedObjectMetadataItem | undefined => {
if (isDefined(timelineActivity.linkedObjectMetadataId)) {
- return objectMetadataItems.find(
+ const linkedObjectMetadataItem = objectMetadataItems.find(
(objectMetadataItem) =>
objectMetadataItem.id === timelineActivity.linkedObjectMetadataId,
);
+
+ if (isDefined(linkedObjectMetadataItem)) {
+ return linkedObjectMetadataItem;
+ }
}
const timelineActivityType = getTimelineActivityType(
timelineActivity,
- timelineActivityTypeById,
+ timelineActivityTypeMaps,
);
if (isDefined(timelineActivityType?.objectUniversalIdentifier)) {
@@ -33,16 +37,5 @@ export const getTimelineActivityLinkedObjectMetadataItem = ({
);
}
- const legacyObjectName = timelineActivity.name?.startsWith('linked-')
- ? timelineActivity.name.split('.')[0].replace('linked-', '')
- : timelineActivity.name?.endsWith('.linked')
- ? timelineActivity.name.split('.')[0]
- : undefined;
-
- return isDefined(legacyObjectName)
- ? objectMetadataItems.find(
- (objectMetadataItem) =>
- objectMetadataItem.nameSingular === legacyObjectName,
- )
- : undefined;
+ return undefined;
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts
index 43867911e32..28818b08f47 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityRecordGqlFields.ts
@@ -10,7 +10,9 @@ type GetTimelineActivityRecordGqlFieldsParams = Pick<
'objectMetadataItems' | 'fields'
>;
-// Timeline rows render scalars and the author only, and the server resolves every requested morph target with its own relation query.
+// Cached linked labels are captured before record permissions are applied, so
+// only the authorized live record identifier may reach the native renderer.
+// Morph targets are resolved separately because each target has its own query.
export const getTimelineActivityRecordGqlFields = ({
objectMetadataItems,
fields,
@@ -18,7 +20,9 @@ export const getTimelineActivityRecordGqlFields = ({
generateDepthRecordGqlFieldsFromFields({
objectMetadataItems,
fields: fields.filter(
- (field) => field.type !== FieldMetadataType.MORPH_RELATION,
+ (field) =>
+ field.type !== FieldMetadataType.MORPH_RELATION &&
+ field.name !== 'linkedRecordCachedName',
),
depth: 1,
});
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityType.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityType.ts
index bcc754c1793..7604be78339 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityType.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/getTimelineActivityType.ts
@@ -1,13 +1,34 @@
import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
import { type TimelineActivityType } from '@/activities/timeline-activities/types/TimelineActivityType';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
import { isDefined } from 'twenty-shared/utils';
-// Undefined while the types are still loading, and for a row whose type an
-// application has since removed.
export const getTimelineActivityType = (
timelineActivity: FilterableTimelineActivity,
- timelineActivityTypeById: Map<string, TimelineActivityType>,
-): TimelineActivityType | undefined =>
- isDefined(timelineActivity.timelineActivityTypeId)
- ? timelineActivityTypeById.get(timelineActivity.timelineActivityTypeId)
+ timelineActivityTypeMaps: TimelineActivityTypeMaps,
+): TimelineActivityType | undefined => {
+ if (isDefined(timelineActivity.timelineActivityTypeSnapshot)) {
+ const liveTimelineActivityType =
+ timelineActivityTypeMaps.byUniversalIdentifier.get(
+ timelineActivity.timelineActivityTypeSnapshot.universalIdentifier,
+ );
+
+ if (!isDefined(liveTimelineActivityType)) {
+ return timelineActivity.timelineActivityTypeSnapshot;
+ }
+
+ return {
+ ...timelineActivity.timelineActivityTypeSnapshot,
+ id: liveTimelineActivityType.id,
+ name: liveTimelineActivityType.name,
+ label: liveTimelineActivityType.label,
+ icon: liveTimelineActivityType.icon,
+ frontComponentUniversalIdentifier:
+ liveTimelineActivityType.frontComponentUniversalIdentifier,
+ };
+ }
+
+ return isDefined(timelineActivity.timelineActivityTypeId)
+ ? timelineActivityTypeMaps.byId.get(timelineActivity.timelineActivityTypeId)
: undefined;
+};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/groupEventsByMonth.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/groupEventsByMonth.ts
index d29bb0fd1c4..6e0219fec23 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/groupEventsByMonth.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/groupEventsByMonth.ts
@@ -8,20 +8,20 @@ export type EventGroup = {
};
export const groupEventsByMonth = (events: TimelineActivity[]) => {
- const acitivityGroups: EventGroup[] = [];
+ const activityGroups: EventGroup[] = [];
for (const event of events) {
- const d = new Date(event.createdAt);
- const month = d.getMonth();
- const year = d.getFullYear();
+ const date = new Date(event.happensAt);
+ const month = date.getMonth();
+ const year = date.getFullYear();
- const matchingGroup = acitivityGroups.find(
- (x) => x.year === year && x.month === month,
+ const matchingGroup = activityGroups.find(
+ (group) => group.year === year && group.month === month,
);
if (isDefined(matchingGroup)) {
matchingGroup.items.push(event);
} else {
- acitivityGroups.push({
+ activityGroups.push({
year,
month,
items: [event],
@@ -29,5 +29,5 @@ export const groupEventsByMonth = (events: TimelineActivity[]) => {
}
}
- return acitivityGroups.sort((a, b) => b.year - a.year || b.month - a.month);
+ return activityGroups.sort((a, b) => b.year - a.year || b.month - a.month);
};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes.ts
index e501a63bc16..67ebd65768c 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/keepTimelineActivitiesOfSelectedTypes.ts
@@ -1,5 +1,7 @@
import { type FilterableTimelineActivity } from '@/activities/timeline-activities/types/FilterableTimelineActivity';
-import { isDefined } from 'twenty-shared/utils';
+import { type TimelineActivityTypeMaps } from '@/activities/timeline-activities/types/TimelineActivityTypeMaps';
+import { getTimelineActivityType } from '@/activities/timeline-activities/utils/getTimelineActivityType';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
// No selection means no filter, so an untouched timeline shows everything
// rather than nothing.
@@ -7,14 +9,21 @@ export const keepTimelineActivitiesOfSelectedTypes = <
TTimelineActivity extends FilterableTimelineActivity,
>(
timelineActivities: TTimelineActivity[],
- selectedTimelineActivityTypeIds: string[],
+ selectedTimelineActivityTypeUniversalIdentifiers: string[],
+ timelineActivityTypeMaps: TimelineActivityTypeMaps,
): TTimelineActivity[] =>
- selectedTimelineActivityTypeIds.length === 0
+ !isNonEmptyArray(selectedTimelineActivityTypeUniversalIdentifiers)
? timelineActivities
- : timelineActivities.filter(
- (timelineActivity) =>
- isDefined(timelineActivity.timelineActivityTypeId) &&
- selectedTimelineActivityTypeIds.includes(
- timelineActivity.timelineActivityTypeId,
- ),
- );
+ : timelineActivities.filter((timelineActivity) => {
+ const timelineActivityTypeUniversalIdentifier = getTimelineActivityType(
+ timelineActivity,
+ timelineActivityTypeMaps,
+ )?.universalIdentifier;
+
+ return (
+ isDefined(timelineActivityTypeUniversalIdentifier) &&
+ selectedTimelineActivityTypeUniversalIdentifiers.includes(
+ timelineActivityTypeUniversalIdentifier,
+ )
+ );
+ });
diff --git a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
index 0ed15672b7c..768c22b821d 100644
--- a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
+++ b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
@@ -26,7 +26,9 @@ type FrontComponentRendererProps = {
frontComponentId: string;
commandMenuItemId?: string;
selectedRecordIds?: string[];
+ timelineActivityId?: string;
loadingFallback?: ReactNode;
+ unavailableFallback?: ReactNode;
};
type ResolvedFrontComponent = NonNullable<
@@ -37,6 +39,7 @@ type FrontComponentRendererContentProps = {
frontComponent: ResolvedFrontComponent;
commandMenuItemId?: string;
selectedRecordIds?: string[];
+ timelineActivityId?: string;
loadingFallback?: ReactNode;
};
@@ -44,7 +47,9 @@ export const FrontComponentRenderer = ({
frontComponentId,
commandMenuItemId,
selectedRecordIds,
+ timelineActivityId,
loadingFallback,
+ unavailableFallback,
}: FrontComponentRendererProps) => {
const { data, loading, error } = useQuery(FindOneFrontComponentDocument, {
variables: { id: frontComponentId },
@@ -60,11 +65,15 @@ export const FrontComponentRenderer = ({
<>
<FrontComponentLoadErrorSnackBarEffect errorMessage={error?.message} />
{loading && loadingFallback}
- {!loading && isDefined(frontComponent) && (
+ {!loading &&
+ (!isDefined(frontComponent) || isDefined(error)) &&
+ unavailableFallback}
+ {!loading && isDefined(frontComponent) && !isDefined(error) && (
<FrontComponentRendererContent
frontComponent={frontComponent}
commandMenuItemId={commandMenuItemId}
selectedRecordIds={selectedRecordIds}
+ timelineActivityId={timelineActivityId}
loadingFallback={loadingFallback}
/>
)}
@@ -76,6 +85,7 @@ const FrontComponentRendererContent = ({
frontComponent,
commandMenuItemId,
selectedRecordIds,
+ timelineActivityId,
loadingFallback,
}: FrontComponentRendererContentProps) => {
const { colorScheme } = useContext(ThemeContext);
@@ -98,6 +108,7 @@ const FrontComponentRendererContent = ({
applicationId,
commandMenuItemId,
selectedRecordIds,
+ timelineActivityId,
colorScheme,
});
diff --git a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
index 5b0617b1282..34f72d7afab 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
+++ b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
@@ -236,6 +236,7 @@ describe('useFrontComponentExecutionContext', () => {
userId: 'user-123',
recordId: 'record-456',
selectedRecordIds: ['record-456'],
+ timelineActivityId: null,
colorScheme: 'light',
locale: i18n.locale as AppLocale,
});
@@ -252,6 +253,7 @@ describe('useFrontComponentExecutionContext', () => {
userId: 'user-123',
recordId: null,
selectedRecordIds: ['record-1', 'record-2', 'record-3'],
+ timelineActivityId: null,
colorScheme: 'light',
locale: i18n.locale as AppLocale,
});
diff --git a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
index 4cee52a7586..277259ed2cd 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
+++ b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
@@ -78,12 +78,14 @@ export const useFrontComponentExecutionContext = ({
applicationId,
commandMenuItemId,
selectedRecordIds,
+ timelineActivityId,
colorScheme,
}: {
frontComponentId: string;
applicationId: string;
commandMenuItemId?: string;
selectedRecordIds?: string[];
+ timelineActivityId?: string;
colorScheme: 'light' | 'dark';
}): {
executionContext: FrontComponentExecutionContext;
@@ -334,6 +336,7 @@ export const useFrontComponentExecutionContext = ({
userId: currentUser?.id ?? null,
recordId: selectedRecordIds?.length === 1 ? selectedRecordIds[0] : null,
selectedRecordIds: selectedRecordIds ?? [],
+ timelineActivityId: timelineActivityId ?? null,
colorScheme,
// i18n.locale is a Lingui string; the host is always configured with the
// APP_LOCALES set, so it is a valid AppLocale.
diff --git a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useCombinedFindManyRecords.ts b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useCombinedFindManyRecords.ts
index a14491ce960..e50c4c3d91b 100644
--- a/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useCombinedFindManyRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/multiple-objects/hooks/useCombinedFindManyRecords.ts
@@ -39,13 +39,19 @@ export const useCombinedFindManyRecords = ({
},
);
- const resultWithoutConnection = Object.fromEntries(
- Object.entries(data ?? {}).map(([namePlural, objectRecordConnection]) => [
- namePlural,
- getRecordsFromRecordConnection({
- recordConnection: objectRecordConnection,
- }),
- ]),
+ const resultWithoutConnection = useMemo(
+ () =>
+ Object.fromEntries(
+ Object.entries(data ?? {}).map(
+ ([namePlural, objectRecordConnection]) => [
+ namePlural,
+ getRecordsFromRecordConnection({
+ recordConnection: objectRecordConnection,
+ }),
+ ],
+ ),
+ ),
+ [data],
);
return {
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/__tests__/RecordListUpsertRecordsInStoreEffect.test.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/__tests__/RecordListUpsertRecordsInStoreEffect.test.tsx
new file mode 100644
index 00000000000..116acbb772a
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/__tests__/RecordListUpsertRecordsInStoreEffect.test.tsx
@@ -0,0 +1,25 @@
+import { render, waitFor } from '@testing-library/react';
+
+import { RecordListUpsertRecordsInStoreEffect } from '@/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect';
+
+const upsertRecordsInStore = jest.fn();
+
+jest.mock('@/object-record/record-store/hooks/useUpsertRecordsInStore', () => ({
+ useUpsertRecordsInStore: () => ({ upsertRecordsInStore }),
+}));
+
+describe('RecordListUpsertRecordsInStoreEffect', () => {
+ it('hydrates partial records for consumers of the shared record store', async () => {
+ const records = [
+ { id: 'note-id', __typename: 'Note', title: 'Quarterly plan' },
+ ];
+
+ render(<RecordListUpsertRecordsInStoreEffect records={records} />);
+
+ await waitFor(() => {
+ expect(upsertRecordsInStore).toHaveBeenCalledWith({
+ partialRecords: records,
+ });
+ });
+ });
+});
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx b/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx
index a736084ce6d..a066377fd19 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/WidgetActionTimelineFilter.tsx
@@ -1,5 +1,5 @@
import { useTimelineActivityTypes } from '@/activities/timeline-activities/hooks/useTimelineActivityTypes';
-import { timelineActivityTypeIdsFilterFamilyState } from '@/activities/timeline-activities/states/timelineActivityTypeIdsFilterFamilyState';
+import { timelineActivityTypeUniversalIdentifiersFilterFamilyState } from '@/activities/timeline-activities/states/timelineActivityTypeUniversalIdentifiersFilterFamilyState';
import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -10,7 +10,7 @@ import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/Gene
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';
import { useLingui } from '@lingui/react/macro';
-import { isDefined } from 'twenty-shared/utils';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { IconFilter, IconFilterOff, useIcons } from 'twenty-ui/icon';
import { MenuItem, MenuItemMultiSelect } from 'twenty-ui/navigation';
@@ -18,36 +18,41 @@ export const WidgetActionTimelineFilter = () => {
const { t } = useLingui();
const targetRecord = useTargetRecord();
const { getIcon } = useIcons();
- const { timelineActivityTypeById } = useTimelineActivityTypes();
+ const { timelineActivityTypeMaps } = useTimelineActivityTypes();
- const timelineActivityTypeIdsFilter = useAtomFamilyStateValue(
- timelineActivityTypeIdsFilterFamilyState,
- targetRecord.id,
- );
- const setTimelineActivityTypeIdsFilter = useSetAtomFamilyState(
- timelineActivityTypeIdsFilterFamilyState,
- targetRecord.id,
- );
+ const timelineActivityTypeUniversalIdentifiersFilter =
+ useAtomFamilyStateValue(
+ timelineActivityTypeUniversalIdentifiersFilterFamilyState,
+ targetRecord.id,
+ );
+ const setTimelineActivityTypeUniversalIdentifiersFilter =
+ useSetAtomFamilyState(
+ timelineActivityTypeUniversalIdentifiersFilterFamilyState,
+ targetRecord.id,
+ );
- // Action-less types rely on a custom renderer and do not map to the built-in
- // event categories exposed by this filter.
- const filterableTimelineActivityTypes = [
- ...timelineActivityTypeById.values(),
- ].filter((timelineActivityType) => isDefined(timelineActivityType.action));
+ const timelineActivityTypes = [
+ ...timelineActivityTypeMaps.byId.values(),
+ ].filter(({ isActive }) => isActive !== false);
- if (filterableTimelineActivityTypes.length === 0) {
+ if (!isNonEmptyArray(timelineActivityTypes)) {
return null;
}
const handleSelectChange = (
- timelineActivityTypeId: string,
+ timelineActivityTypeUniversalIdentifier: string,
selected: boolean,
) =>
- setTimelineActivityTypeIdsFilter(
+ setTimelineActivityTypeUniversalIdentifiersFilter(
selected
- ? [...timelineActivityTypeIdsFilter, timelineActivityTypeId]
- : timelineActivityTypeIdsFilter.filter(
- (selectedId) => selectedId !== timelineActivityTypeId,
+ ? [
+ ...timelineActivityTypeUniversalIdentifiersFilter,
+ timelineActivityTypeUniversalIdentifier,
+ ]
+ : timelineActivityTypeUniversalIdentifiersFilter.filter(
+ (selectedUniversalIdentifier) =>
+ selectedUniversalIdentifier !==
+ timelineActivityTypeUniversalIdentifier,
),
);
@@ -64,32 +69,37 @@ export const WidgetActionTimelineFilter = () => {
dropdownComponents={
<DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>
<DropdownMenuItemsContainer hasMaxHeight>
- {filterableTimelineActivityTypes.map((timelineActivityType) => (
+ {timelineActivityTypes.map((timelineActivityType) => (
<MenuItemMultiSelect
- key={timelineActivityType.id}
+ key={timelineActivityType.universalIdentifier}
LeftIcon={
isDefined(timelineActivityType.icon)
? getIcon(timelineActivityType.icon)
: undefined
}
text={timelineActivityType.label}
- selected={timelineActivityTypeIdsFilter.includes(
- timelineActivityType.id,
+ selected={timelineActivityTypeUniversalIdentifiersFilter.includes(
+ timelineActivityType.universalIdentifier,
)}
onSelectChange={(selected) =>
- handleSelectChange(timelineActivityType.id, selected)
+ handleSelectChange(
+ timelineActivityType.universalIdentifier,
+ selected,
+ )
}
/>
))}
</DropdownMenuItemsContainer>
- {timelineActivityTypeIdsFilter.length > 0 && (
+ {isNonEmptyArray(timelineActivityTypeUniversalIdentifiersFilter) && (
<>
<DropdownMenuSeparator />
<DropdownMenuItemsContainer scrollable={false}>
<MenuItem
LeftIcon={IconFilterOff}
text={t`Clear filter`}
- onClick={() => setTimelineActivityTypeIdsFilter([])}
+ onClick={() =>
+ setTimelineActivityTypeUniversalIdentifiersFilter([])
+ }
/>
</DropdownMenuItemsContainer>
</>
diff --git a/packages/twenty-sdk/src/cli/__tests__/apps/minimal-app/__integration__/app-dev/expected-manifest.ts b/packages/twenty-sdk/src/cli/__tests__/apps/minimal-app/__integration__/app-dev/expected-manifest.ts
index d8492cf8bf6..e9dea5e3c6c 100644
--- a/packages/twenty-sdk/src/cli/__tests__/apps/minimal-app/__integration__/app-dev/expected-manifest.ts
+++ b/packages/twenty-sdk/src/cli/__tests__/apps/minimal-app/__integration__/app-dev/expected-manifest.ts
@@ -4,6 +4,7 @@ import { FieldMetadataType } from 'twenty-shared/types';
export const EXPECTED_MANIFEST: Manifest = {
commandMenuItems: [],
+ timelineActivityTypes: [],
application: {
universalIdentifier: 'e1e2e3e4-e5e6-4000-8000-000000000001',
displayName: 'Root App',
diff --git a/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.ts b/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.ts
index a9be15a8500..a0e235d27cb 100644
--- a/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.ts
+++ b/packages/twenty-sdk/src/cli/__tests__/apps/rich-app/__integration__/app-dev/expected-manifest.ts
@@ -13,6 +13,30 @@ import {
} from 'twenty-shared/types';
export const EXPECTED_MANIFEST: Manifest = {
+ timelineActivityTypes: [
+ {
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7500',
+ name: 'postCardCreated',
+ label: 'created a post card',
+ icon: 'IconMail',
+ frontComponentUniversalIdentifier: '88c15ae2-5f87-4a6b-b48f-1974bbe62eb7',
+ },
+ {
+ universalIdentifier: 'f4fa646c-6e11-4d8f-a6be-c3b7a2fc7501',
+ name: 'postCardLinked',
+ label: 'received a post card',
+ icon: 'IconMail',
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier: '54b589ca-eeed-4950-a176-358418b85c05',
+ through: {
+ relationFieldUniversalIdentifier:
+ 'a1a2b3c4-0001-4a7b-8c9d-0e1f2a3b4c5d',
+ },
+ },
+ frontComponentUniversalIdentifier: '88c15ae2-5f87-4a6b-b48f-1974bbe62eb7',
+ },
+ ],
commandMenuItems: [],
permissionFlags: [],
pageLayouts: [],
@@ -326,6 +350,8 @@ export const EXPECTED_MANIFEST: Manifest = {
type: FieldType.RELATION,
universalIdentifier: 'a1a2b3c4-0001-4a7b-8c9d-0e1f2a3b4c5d',
universalSettings: {
+ junctionTargetFieldUniversalIdentifier:
+ 'a1a2b3c4-0004-4a7b-8c9d-0e1f2a3b4c5d',
relationType: RelationType.ONE_TO_MANY,
},
},
@@ -670,6 +696,14 @@ export const EXPECTED_MANIFEST: Manifest = {
canUpdateObjectRecords: true,
objectUniversalIdentifier: '54b589ca-eeed-4950-a176-358418b85c05',
},
+ {
+ universalIdentifier: 'd92786b1-eedb-50f6-9397-7a6c2591578a',
+ canDestroyObjectRecords: false,
+ canReadObjectRecords: true,
+ canSoftDeleteObjectRecords: false,
+ canUpdateObjectRecords: true,
+ objectUniversalIdentifier: '20202020-6736-4337-b5c4-8b39fae325a5',
+ },
],
rowLevelPermissionPredicateGroups: [],
rowLevelPermissionPredicates: [],
diff --git a/packages/twenty-sdk/src/cli/commands/dev/add.ts b/packages/twenty-sdk/src/cli/commands/dev/add.ts
index cebeb8163f1..47960660c04 100644
--- a/packages/twenty-sdk/src/cli/commands/dev/add.ts
+++ b/packages/twenty-sdk/src/cli/commands/dev/add.ts
@@ -32,6 +32,7 @@ import { getConnectionProviderBaseFile } from '@/cli/utilities/entity/entity-con
import { getSkillBaseFile } from '@/cli/utilities/entity/entity-skill-template';
import { getViewBaseFile } from '@/cli/utilities/entity/entity-view-template';
import { getViewFieldBaseFile } from '@/cli/utilities/entity/entity-view-field-template';
+import { getTimelineActivityTypeBaseFile } from '@/cli/utilities/entity/entity-timeline-activity-type-template';
import { ensureDir, pathExists } from '@/cli/utilities/file/fs-utils';
import { kebabCase } from '@/cli/utilities/string/kebab-case';
@@ -273,6 +274,14 @@ export class EntityAddCommand {
return { name, file };
}
+ case SyncableEntity.TimelineActivityType: {
+ const name = await this.getEntityName(entity);
+
+ const file = getTimelineActivityTypeBaseFile({ name });
+
+ return { name, file };
+ }
+
default:
assertUnreachable(entity);
}
diff --git a/packages/twenty-sdk/src/cli/utilities/build/common/plugins/__tests__/__snapshots__/stub-twenty-sdk-define.plugin.spec.ts.snap b/packages/twenty-sdk/src/cli/utilities/build/common/plugins/__tests__/__snapshots__/stub-twenty-sdk-define.plugin.spec.ts.snap
index 4f037ef294f..e0be42f0a0c 100644
--- a/packages/twenty-sdk/src/cli/utilities/build/common/plugins/__tests__/__snapshots__/stub-twenty-sdk-define.plugin.spec.ts.snap
+++ b/packages/twenty-sdk/src/cli/utilities/build/common/plugins/__tests__/__snapshots__/stub-twenty-sdk-define.plugin.spec.ts.snap
@@ -91,6 +91,7 @@ exports[`stub-twenty-sdk-define plugin > matches the recorded export partition 1
"defineRole",
"defineSettingsFrontComponent",
"defineSkill",
+ "defineTimelineActivityType",
"defineUninstallLogicFunction",
"defineView",
"defineViewField",
diff --git a/packages/twenty-sdk/src/cli/utilities/build/manifest/__tests__/manifest-validate.spec.ts b/packages/twenty-sdk/src/cli/utilities/build/manifest/__tests__/manifest-validate.spec.ts
index bb72dc46ba7..23ee86b0106 100644
--- a/packages/twenty-sdk/src/cli/utilities/build/manifest/__tests__/manifest-validate.spec.ts
+++ b/packages/twenty-sdk/src/cli/utilities/build/manifest/__tests__/manifest-validate.spec.ts
@@ -32,6 +32,7 @@ const validField: FieldManifest = {
const validManifest: Manifest = {
commandMenuItems: [],
+ timelineActivityTypes: [],
application: validApplication,
objects: [],
frontComponents: [],
diff --git a/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.ts b/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.ts
index 6dc815d72b7..263c585d7b8 100644
--- a/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.ts
+++ b/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-build.ts
@@ -23,6 +23,7 @@ import { type ObjectConfig } from '@/sdk/define/objects/object-config';
import { type PageLayoutConfig } from '@/sdk/define/page-layouts/page-layout-config';
import { type PageLayoutTabConfig } from '@/sdk/define/page-layouts/page-layout-tab-config';
import { type RoleConfig } from '@/sdk/define/roles/role-config';
+import { type TimelineActivityTypeConfig } from '@/sdk/define/timeline-activity-types/timeline-activity-type-config';
import { type ViewConfig } from '@/sdk/define/views/view-config';
import { readFile } from 'node:fs/promises';
import { basename, extname, join, relative } from 'path';
@@ -50,6 +51,7 @@ import {
type RoleManifest,
type SkillManifest,
type StandaloneViewFieldManifest,
+ type TimelineActivityTypeManifest,
type ViewManifest,
} from 'twenty-shared/application';
import {
@@ -117,6 +119,7 @@ export const buildManifest = async (
const pageLayouts: PageLayoutManifest[] = [];
const pageLayoutTabs: PageLayoutTabManifest[] = [];
const commandMenuItems: CommandMenuItemManifest[] = [];
+ const timelineActivityTypes: TimelineActivityTypeManifest[] = [];
const postInstallLogicFunctions: PostInstallLogicFunctionApplicationManifest[] =
[];
const preInstallLogicFunctions: PreInstallLogicFunctionApplicationManifest[] =
@@ -143,6 +146,7 @@ export const buildManifest = async (
const pageLayoutsFilePaths: string[] = [];
const pageLayoutTabsFilePaths: string[] = [];
const commandMenuItemsFilePaths: string[] = [];
+ const timelineActivityTypesFilePaths: string[] = [];
for (const filePath of filePaths) {
const fileContent = await readFile(filePath, 'utf-8');
@@ -492,6 +496,19 @@ export const buildManifest = async (
commandMenuItemsFilePaths.push(relativePath);
break;
}
+ case ManifestEntityKey.TimelineActivityTypes: {
+ const extract =
+ await extractManifestFromFile<TimelineActivityTypeConfig>({
+ appPath,
+ filePath,
+ });
+
+ timelineActivityTypes.push(extract.config);
+ errors.push(...extract.errors);
+ warnings.push(...(extract.warnings ?? []));
+ timelineActivityTypesFilePaths.push(relativePath);
+ break;
+ }
case ManifestEntityKey.PublicAssets: {
// Public assets are handled below
break;
@@ -575,10 +592,8 @@ export const buildManifest = async (
errors.push('Only one defineApplicationRole is allowed per application');
}
- const {
- sharedDependencies,
- errors: sharedDependenciesErrors,
- } = await extractFrontComponentSharedDependencies(appPath);
+ const { sharedDependencies, errors: sharedDependenciesErrors } =
+ await extractFrontComponentSharedDependencies(appPath);
errors.push(...sharedDependenciesErrors);
@@ -672,6 +687,7 @@ export const buildManifest = async (
pageLayouts: pageLayouts.sort(byId),
pageLayoutTabs: pageLayoutTabs.sort(byId),
commandMenuItems: commandMenuItems.sort(byId),
+ timelineActivityTypes: timelineActivityTypes.sort(byId),
};
const entityFilePaths: EntityFilePaths = {
@@ -693,6 +709,7 @@ export const buildManifest = async (
pageLayouts: pageLayoutsFilePaths,
pageLayoutTabs: pageLayoutTabsFilePaths,
commandMenuItems: commandMenuItemsFilePaths,
+ timelineActivityTypes: timelineActivityTypesFilePaths,
};
return { manifest, filePaths: entityFilePaths, errors, warnings };
diff --git a/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-extract-config.ts b/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-extract-config.ts
index 6f7135b4c6a..8bffad78b58 100644
--- a/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-extract-config.ts
+++ b/packages/twenty-sdk/src/cli/utilities/build/manifest/manifest-extract-config.ts
@@ -23,6 +23,7 @@ export enum TargetFunction {
DefinePageLayout = 'definePageLayout',
DefinePageLayoutTab = 'definePageLayoutTab',
DefineCommandMenuItem = 'defineCommandMenuItem',
+ DefineTimelineActivityType = 'defineTimelineActivityType',
}
export enum ManifestEntityKey {
@@ -44,6 +45,7 @@ export enum ManifestEntityKey {
PageLayouts = 'pageLayouts',
PageLayoutTabs = 'pageLayoutTabs',
CommandMenuItems = 'commandMenuItems',
+ TimelineActivityTypes = 'timelineActivityTypes',
}
export type EntityFilePaths = Record<ManifestEntityKey, string[]>;
@@ -80,6 +82,8 @@ export const TARGET_FUNCTION_TO_ENTITY_KEY_MAPPING: Record<
[TargetFunction.DefinePageLayout]: ManifestEntityKey.PageLayouts,
[TargetFunction.DefinePageLayoutTab]: ManifestEntityKey.PageLayoutTabs,
[TargetFunction.DefineCommandMenuItem]: ManifestEntityKey.CommandMenuItems,
+ [TargetFunction.DefineTimelineActivityType]:
+ ManifestEntityKey.TimelineActivityTypes,
};
const computeIsTargetFunctionCall = (node: ts.Node): string | undefined => {
diff --git a/packages/twenty-sdk/src/cli/utilities/dev/orchestrator/dev-mode-orchestrator-state.ts b/packages/twenty-sdk/src/cli/utilities/dev/orchestrator/dev-mode-orchestrator-state.ts
index 49c0a60772a..392ec0ec426 100644
--- a/packages/twenty-sdk/src/cli/utilities/dev/orchestrator/dev-mode-orchestrator-state.ts
+++ b/packages/twenty-sdk/src/cli/utilities/dev/orchestrator/dev-mode-orchestrator-state.ts
@@ -80,6 +80,7 @@ const ENTITY_TYPE_TO_SYNCABLE: Record<string, SyncableEntity | undefined> = {
pageLayouts: SyncableEntity.PageLayout,
pageLayoutTabs: SyncableEntity.PageLayoutTab,
commandMenuItems: SyncableEntity.CommandMenuItem,
+ timelineActivityTypes: SyncableEntity.TimelineActivityType,
};
const MAX_EVENT_COUNT = 200;
diff --git a/packages/twenty-sdk/src/cli/utilities/dev/ui/dev-ui-constants.ts b/packages/twenty-sdk/src/cli/utilities/dev/ui/dev-ui-constants.ts
index a0030d4de96..01b3a89e697 100644
--- a/packages/twenty-sdk/src/cli/utilities/dev/ui/dev-ui-constants.ts
+++ b/packages/twenty-sdk/src/cli/utilities/dev/ui/dev-ui-constants.ts
@@ -97,6 +97,7 @@ export const ENTITY_LABELS: Record<SyncableEntity, string> = {
[SyncableEntity.PageLayoutTab]: 'Page layout tabs',
[SyncableEntity.Agent]: 'Agents',
[SyncableEntity.ConnectionProvider]: 'Connection providers',
+ [SyncableEntity.TimelineActivityType]: 'Timeline activity types',
};
export const ENTITY_ORDER = Object.keys(ENTITY_LABELS) as SyncableEntity[];
diff --git a/packages/twenty-sdk/src/cli/utilities/entity/entity-timeline-activity-type-template.ts b/packages/twenty-sdk/src/cli/utilities/entity/entity-timeline-activity-type-template.ts
new file mode 100644
index 00000000000..1237341c010
--- /dev/null
+++ b/packages/twenty-sdk/src/cli/utilities/entity/entity-timeline-activity-type-template.ts
@@ -0,0 +1,14 @@
+import { v4 as uuidv4 } from 'uuid';
+
+export const getTimelineActivityTypeBaseFile = ({
+ name,
+}: {
+ name: string;
+}) => `import { defineTimelineActivityType } from 'twenty-sdk/define';
+
+export default defineTimelineActivityType({
+ universalIdentifier: '${uuidv4()}',
+ name: '${name}',
+ label: '${name}',
+});
+`;
diff --git a/packages/twenty-sdk/src/cli/utilities/translations/__tests__/application-translations.spec.ts b/packages/twenty-sdk/src/cli/utilities/translations/__tests__/application-translations.spec.ts
index 3acb9b2bc0c..8876577b80e 100644
--- a/packages/twenty-sdk/src/cli/utilities/translations/__tests__/application-translations.spec.ts
+++ b/packages/twenty-sdk/src/cli/utilities/translations/__tests__/application-translations.spec.ts
@@ -83,6 +83,7 @@ describe('collectTranslatableStrings', () => {
pageLayoutTabs: [{ title: 'Telemetry' }],
commandMenuItems: [{ label: 'Launch Rocket', shortLabel: 'Launch' }],
navigationMenuItems: [{ name: 'Missions' }],
+ timelineActivityTypes: [{ label: 'Launched a rocket' }],
pageLayouts: [
{
name: 'Mission Control Layout',
@@ -103,6 +104,10 @@ describe('collectTranslatableStrings', () => {
{ message: 'Launch Rocket', context: 'commandMenuItem.label' },
{ message: 'Launch', context: 'commandMenuItem.shortLabel' },
{ message: 'Missions', context: 'navigationMenuItem.name' },
+ {
+ message: 'Launched a rocket',
+ context: 'timelineActivityType.label',
+ },
{ message: 'Mission Control Layout', context: 'pageLayout.name' },
{ message: 'Overview', context: 'pageLayoutTab.title' },
{ message: 'Fuel level', context: 'pageLayoutWidget.title' },
diff --git a/packages/twenty-sdk/src/cli/utilities/translations/collect-translatable-strings.ts b/packages/twenty-sdk/src/cli/utilities/translations/collect-translatable-strings.ts
index 5940b39c6e9..3b1043108ff 100644
Binary files a/packages/twenty-sdk/src/cli/utilities/translations/collect-translatable-strings.ts and b/packages/twenty-sdk/src/cli/utilities/translations/collect-translatable-strings.ts differ
diff --git a/packages/twenty-sdk/src/sdk/define/index.ts b/packages/twenty-sdk/src/sdk/define/index.ts
index f638bc38553..8da85ec9672 100644
--- a/packages/twenty-sdk/src/sdk/define/index.ts
+++ b/packages/twenty-sdk/src/sdk/define/index.ts
@@ -35,6 +35,10 @@ export { defineCommandMenuItem } from '@/sdk/define/command-menu-items/define-co
export type { CommandMenuItemConfig } from '@/sdk/define/command-menu-items/command-menu-item-config';
export type { CommandMenuItemManifest } from 'twenty-shared/application';
+export { defineTimelineActivityType } from '@/sdk/define/timeline-activity-types/define-timeline-activity-type';
+export type { TimelineActivityTypeConfig } from '@/sdk/define/timeline-activity-types/timeline-activity-type-config';
+export type { TimelineActivityTypeManifest } from 'twenty-shared/application';
+
export {
pageType,
isInSidePanel,
diff --git a/packages/twenty-sdk/src/sdk/define/timeline-activity-types/__tests__/define-timeline-activity-type.spec.ts b/packages/twenty-sdk/src/sdk/define/timeline-activity-types/__tests__/define-timeline-activity-type.spec.ts
new file mode 100644
index 00000000000..537d2742005
--- /dev/null
+++ b/packages/twenty-sdk/src/sdk/define/timeline-activity-types/__tests__/define-timeline-activity-type.spec.ts
@@ -0,0 +1,203 @@
+import { describe, expect, it } from 'vitest';
+
+import { defineTimelineActivityType } from '@/sdk/define';
+
+const baseValidConfig = {
+ universalIdentifier: '11111111-1111-4111-8111-111111111111',
+ name: 'deploymentCompleted',
+ label: 'completed a deployment',
+ emit: {
+ on: 'updated' as const,
+ objectUniversalIdentifier: '22222222-2222-4222-8222-222222222222',
+ through: {
+ relationFieldUniversalIdentifier: '44444444-4444-4444-8444-444444444444',
+ triggerFieldUniversalIdentifiers: [
+ '55555555-5555-4555-8555-555555555555',
+ ],
+ },
+ },
+ frontComponentUniversalIdentifier: '33333333-3333-4333-8333-333333333333',
+};
+
+describe('defineTimelineActivityType', () => {
+ it('returns the generic native and custom rendering contract', () => {
+ const result = defineTimelineActivityType(baseValidConfig);
+
+ expect(result).toEqual({
+ success: true,
+ config: baseValidConfig,
+ errors: [],
+ warnings: [],
+ });
+ });
+
+ it.each([
+ [
+ 'universalIdentifier',
+ 'TimelineActivityType must have a universalIdentifier',
+ ],
+ ['name', 'TimelineActivityType must have a name'],
+ ['label', 'TimelineActivityType must have a label'],
+ ] as const)('reports a missing %s', (property, error) => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ [property]: '',
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(error);
+ });
+
+ it('reports an unsupported emit action', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: {
+ ...baseValidConfig.emit,
+ // @ts-expect-error verifies runtime validation for JavaScript callers.
+ on: 'deployed',
+ },
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType emit.on deployed is not supported',
+ );
+ });
+
+ it('requires an action for automatic emission', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: {
+ ...baseValidConfig.emit,
+ // @ts-expect-error verifies runtime validation for JavaScript callers.
+ on: '',
+ },
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType emit must have an on action',
+ );
+ });
+
+ it('requires a source object for automatic emission', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: {
+ ...baseValidConfig.emit,
+ objectUniversalIdentifier: '',
+ },
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType emit must have an objectUniversalIdentifier',
+ );
+ });
+
+ it('requires a relation field for through routing', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: {
+ ...baseValidConfig.emit,
+ through: {
+ ...baseValidConfig.emit.through,
+ relationFieldUniversalIdentifier: '',
+ },
+ },
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType emit.through must have a relationFieldUniversalIdentifier',
+ );
+ });
+
+ it('requires through routing for linked and unlinked events', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier:
+ baseValidConfig.emit.objectUniversalIdentifier,
+ },
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType linked and unlinked emitters require through routing',
+ );
+ });
+
+ it('restricts trigger fields to updated through events', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: { ...baseValidConfig.emit, on: 'linked' },
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType emit.through.triggerFieldUniversalIdentifiers requires an updated event',
+ );
+ });
+
+ it('rejects duplicate trigger fields', () => {
+ const triggerFieldUniversalIdentifier =
+ baseValidConfig.emit.through.triggerFieldUniversalIdentifiers[0];
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: {
+ ...baseValidConfig.emit,
+ through: {
+ ...baseValidConfig.emit.through,
+ triggerFieldUniversalIdentifiers: [
+ triggerFieldUniversalIdentifier,
+ triggerFieldUniversalIdentifier,
+ ],
+ },
+ },
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType emit.through.triggerFieldUniversalIdentifiers must be unique',
+ );
+ });
+
+ it('requires a concrete event contract for overrides', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: undefined,
+ replacesTimelineActivityTypeUniversalIdentifier:
+ '66666666-6666-4666-8666-666666666666',
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.errors).toContain(
+ 'TimelineActivityType replacesTimelineActivityTypeUniversalIdentifier requires emit',
+ );
+ });
+
+ it('accepts an explicit-only type without emit', () => {
+ const result = defineTimelineActivityType({
+ universalIdentifier: baseValidConfig.universalIdentifier,
+ name: baseValidConfig.name,
+ label: baseValidConfig.label,
+ });
+
+ expect(result).toMatchObject({ success: true, errors: [] });
+ });
+
+ it('accepts a self emitter without through routing', () => {
+ const result = defineTimelineActivityType({
+ ...baseValidConfig,
+ emit: {
+ on: 'created',
+ objectUniversalIdentifier:
+ baseValidConfig.emit.objectUniversalIdentifier,
+ },
+ });
+
+ expect(result).toMatchObject({ success: true, errors: [] });
+ });
+});
diff --git a/packages/twenty-sdk/src/sdk/define/timeline-activity-types/define-timeline-activity-type.ts b/packages/twenty-sdk/src/sdk/define/timeline-activity-types/define-timeline-activity-type.ts
new file mode 100644
index 00000000000..07f608ed975
--- /dev/null
+++ b/packages/twenty-sdk/src/sdk/define/timeline-activity-types/define-timeline-activity-type.ts
@@ -0,0 +1,90 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { isTimelineActivityAction } from 'twenty-shared/timeline';
+import { isNonEmptyArray } from 'twenty-shared/utils';
+
+import { type DefineEntity } from '@/sdk/define/common/types/define-entity.type';
+import { createValidationResult } from '@/sdk/define/common/utils/create-validation-result';
+import { type TimelineActivityTypeConfig } from '@/sdk/define/timeline-activity-types/timeline-activity-type-config';
+
+export const defineTimelineActivityType: DefineEntity<
+ TimelineActivityTypeConfig
+> = (config) => {
+ const errors: string[] = [];
+
+ if (!config.universalIdentifier) {
+ errors.push('TimelineActivityType must have a universalIdentifier');
+ }
+
+ if (!config.name) {
+ errors.push('TimelineActivityType must have a name');
+ }
+
+ if (!config.label) {
+ errors.push('TimelineActivityType must have a label');
+ }
+
+ if (config.emit?.on && !isTimelineActivityAction(config.emit.on)) {
+ errors.push(
+ `TimelineActivityType emit.on ${config.emit.on} is not supported`,
+ );
+ }
+
+ if (config.emit && !isNonEmptyString(config.emit.on)) {
+ errors.push('TimelineActivityType emit must have an on action');
+ }
+
+ if (config.emit && !isNonEmptyString(config.emit.objectUniversalIdentifier)) {
+ errors.push(
+ 'TimelineActivityType emit must have an objectUniversalIdentifier',
+ );
+ }
+
+ if (
+ config.emit?.through &&
+ !isNonEmptyString(config.emit.through.relationFieldUniversalIdentifier)
+ ) {
+ errors.push(
+ 'TimelineActivityType emit.through must have a relationFieldUniversalIdentifier',
+ );
+ }
+
+ if (
+ (config.emit?.on === 'linked' || config.emit?.on === 'unlinked') &&
+ !config.emit.through
+ ) {
+ errors.push(
+ 'TimelineActivityType linked and unlinked emitters require through routing',
+ );
+ }
+
+ const triggerFieldUniversalIdentifiers =
+ config.emit?.through?.triggerFieldUniversalIdentifiers;
+
+ if (
+ triggerFieldUniversalIdentifiers &&
+ (config.emit?.on !== 'updated' ||
+ !isNonEmptyArray(triggerFieldUniversalIdentifiers))
+ ) {
+ errors.push(
+ 'TimelineActivityType emit.through.triggerFieldUniversalIdentifiers requires an updated event',
+ );
+ }
+
+ if (
+ triggerFieldUniversalIdentifiers &&
+ new Set(triggerFieldUniversalIdentifiers).size !==
+ triggerFieldUniversalIdentifiers.length
+ ) {
+ errors.push(
+ 'TimelineActivityType emit.through.triggerFieldUniversalIdentifiers must be unique',
+ );
+ }
+
+ if (config.replacesTimelineActivityTypeUniversalIdentifier && !config.emit) {
+ errors.push(
+ 'TimelineActivityType replacesTimelineActivityTypeUniversalIdentifier requires emit',
+ );
+ }
+
+ return createValidationResult({ config, errors });
+};
diff --git a/packages/twenty-sdk/src/sdk/define/timeline-activity-types/timeline-activity-type-config.ts b/packages/twenty-sdk/src/sdk/define/timeline-activity-types/timeline-activity-type-config.ts
new file mode 100644
index 00000000000..6098fb2c037
--- /dev/null
+++ b/packages/twenty-sdk/src/sdk/define/timeline-activity-types/timeline-activity-type-config.ts
@@ -0,0 +1,3 @@
+import { type TimelineActivityTypeManifest } from 'twenty-shared/application';
+
+export type TimelineActivityTypeConfig = TimelineActivityTypeManifest;
diff --git a/packages/twenty-sdk/src/sdk/front-component/hooks/useTimelineActivityId.ts b/packages/twenty-sdk/src/sdk/front-component/hooks/useTimelineActivityId.ts
new file mode 100644
index 00000000000..e78bb566f7b
--- /dev/null
+++ b/packages/twenty-sdk/src/sdk/front-component/hooks/useTimelineActivityId.ts
@@ -0,0 +1,4 @@
+import { useFrontComponentExecutionContext } from './useFrontComponentExecutionContext';
+
+export const useTimelineActivityId = (): string | null =>
+ useFrontComponentExecutionContext((context) => context.timelineActivityId);
diff --git a/packages/twenty-sdk/src/sdk/front-component/index.ts b/packages/twenty-sdk/src/sdk/front-component/index.ts
index c51bb159e77..f629fc91ee9 100644
--- a/packages/twenty-sdk/src/sdk/front-component/index.ts
+++ b/packages/twenty-sdk/src/sdk/front-component/index.ts
@@ -18,6 +18,7 @@ export type { UseTranslateResult } from './hooks/useTranslate';
export { useLocale } from './hooks/useLocale';
export { useRecordId } from './hooks/useRecordId';
export { useSelectedRecordIds } from './hooks/useSelectedRecordIds';
+export { useTimelineActivityId } from './hooks/useTimelineActivityId';
export { useUserId } from './hooks/useUserId';
export { msg } from './translations/msg';
export { t } from './translations/t';
diff --git a/packages/twenty-sdk/src/sdk/front-component/types/FrontComponentExecutionContext.ts b/packages/twenty-sdk/src/sdk/front-component/types/FrontComponentExecutionContext.ts
index 660956c839c..9515c8883f2 100644
--- a/packages/twenty-sdk/src/sdk/front-component/types/FrontComponentExecutionContext.ts
+++ b/packages/twenty-sdk/src/sdk/front-component/types/FrontComponentExecutionContext.ts
@@ -9,6 +9,7 @@ export type FrontComponentExecutionContext = {
recordId: string | null;
/** All selected record IDs */
selectedRecordIds: string[];
+ timelineActivityId: string | null;
/** Resolved color scheme of the host UI ('System' is already resolved) */
colorScheme: 'light' | 'dark';
locale?: AppLocale;
diff --git a/packages/twenty-sdk/src/sdk/logic-function/index.ts b/packages/twenty-sdk/src/sdk/logic-function/index.ts
index bb26eead027..ee2703334ba 100644
--- a/packages/twenty-sdk/src/sdk/logic-function/index.ts
+++ b/packages/twenty-sdk/src/sdk/logic-function/index.ts
@@ -67,6 +67,12 @@ export type {
EnqueueJobResult,
} from 'twenty-shared/application';
+export { createTimelineActivity } from '@/sdk/logic-function/timeline/create-timeline-activity';
+export type {
+ CreatedTimelineActivity,
+ CreateTimelineActivityInput,
+} from '@/sdk/logic-function/timeline/create-timeline-activity';
+
export { kv } from '@/sdk/logic-function/key-value/kv';
export type { AppKeyValue, AppKeyValueScope } from 'twenty-shared/application';
diff --git a/packages/twenty-sdk/src/sdk/logic-function/timeline/__tests__/create-timeline-activity.spec.ts b/packages/twenty-sdk/src/sdk/logic-function/timeline/__tests__/create-timeline-activity.spec.ts
new file mode 100644
index 00000000000..45860448b2a
--- /dev/null
+++ b/packages/twenty-sdk/src/sdk/logic-function/timeline/__tests__/create-timeline-activity.spec.ts
@@ -0,0 +1,209 @@
+import {
+ afterEach,
+ beforeEach,
+ describe,
+ expect,
+ it,
+ vi,
+ type MockInstance,
+} from 'vitest';
+
+const TYPE_UNIVERSAL_IDENTIFIER = '11111111-1111-4111-8111-111111111111';
+const TYPE_ID = '22222222-2222-4222-8222-222222222222';
+const TARGET_OBJECT_UNIVERSAL_IDENTIFIER =
+ '66666666-6666-4666-8666-666666666666';
+const LINKED_OBJECT_UNIVERSAL_IDENTIFIER =
+ '77777777-7777-4777-8777-777777777777';
+const LINKED_OBJECT_ID = '88888888-8888-4888-8888-888888888888';
+
+const importCreateTimelineActivity = async () => {
+ const module =
+ await import('@/sdk/logic-function/timeline/create-timeline-activity');
+
+ return module.createTimelineActivity;
+};
+
+const response = (data: unknown) =>
+ new Response(JSON.stringify(data), {
+ status: 200,
+ headers: { 'Content-Type': 'application/json' },
+ });
+
+describe('createTimelineActivity', () => {
+ let fetchSpy: MockInstance<typeof fetch>;
+
+ beforeEach(() => {
+ vi.resetModules();
+ process.env.TWENTY_API_URL = 'https://api.test';
+ process.env.TWENTY_APP_ACCESS_TOKEN = 'app-token';
+ fetchSpy = vi.spyOn(globalThis, 'fetch');
+ });
+
+ afterEach(() => {
+ delete process.env.TWENTY_API_URL;
+ delete process.env.TWENTY_APP_ACCESS_TOKEN;
+ fetchSpy.mockRestore();
+ });
+
+ it('resolves the manifest identifier and creates a generically targeted row', async () => {
+ const createTimelineActivity = await importCreateTimelineActivity();
+ const createdTimelineActivity = {
+ id: '33333333-3333-4333-8333-333333333333',
+ timelineActivityTypeId: TYPE_ID,
+ timelineActivityTypeSnapshot: { label: 'updated a post card' },
+ };
+
+ fetchSpy
+ .mockResolvedValueOnce(
+ response({
+ data: {
+ timelineActivityTypes: [
+ {
+ id: TYPE_ID,
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ isActive: true,
+ },
+ ],
+ objects: {
+ edges: [
+ {
+ node: {
+ universalIdentifier: TARGET_OBJECT_UNIVERSAL_IDENTIFIER,
+ nameSingular: 'postCard',
+ },
+ },
+ {
+ node: {
+ id: LINKED_OBJECT_ID,
+ universalIdentifier: LINKED_OBJECT_UNIVERSAL_IDENTIFIER,
+ nameSingular: 'recipient',
+ },
+ },
+ ],
+ },
+ },
+ }),
+ )
+ .mockResolvedValueOnce(
+ response({
+ data: { createTimelineActivity: createdTimelineActivity },
+ }),
+ );
+
+ await expect(
+ createTimelineActivity({
+ timelineActivityTypeUniversalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ targetObjectUniversalIdentifier: TARGET_OBJECT_UNIVERSAL_IDENTIFIER,
+ targetRecordId: '44444444-4444-4444-8444-444444444444',
+ linkedRecordId: '55555555-5555-4555-8555-555555555555',
+ linkedObjectMetadataUniversalIdentifier:
+ LINKED_OBJECT_UNIVERSAL_IDENTIFIER,
+ properties: { delivery: 'express' },
+ }),
+ ).resolves.toEqual(createdTimelineActivity);
+
+ expect(fetchSpy.mock.calls[0][0]).toBe('https://api.test/metadata');
+ expect(fetchSpy.mock.calls[0][1]?.body).toContain(
+ TARGET_OBJECT_UNIVERSAL_IDENTIFIER,
+ );
+ expect(fetchSpy.mock.calls[0][1]?.body).toContain(
+ LINKED_OBJECT_UNIVERSAL_IDENTIFIER,
+ );
+ expect(fetchSpy.mock.calls[1][0]).toBe(
+ 'https://api.test/rest/timelineActivities',
+ );
+
+ const restBody = JSON.parse(fetchSpy.mock.calls[1][1]?.body as string);
+
+ expect(restBody).toEqual({
+ timelineActivityTypeId: TYPE_ID,
+ targetPostCardId: '44444444-4444-4444-8444-444444444444',
+ linkedRecordId: '55555555-5555-4555-8555-555555555555',
+ linkedObjectMetadataId: LINKED_OBJECT_ID,
+ properties: { delivery: 'express' },
+ });
+ });
+
+ it('fails before writing when the application type is not installed', async () => {
+ const createTimelineActivity = await importCreateTimelineActivity();
+ fetchSpy.mockResolvedValueOnce(
+ response({
+ data: { timelineActivityTypes: [], objects: { edges: [] } },
+ }),
+ );
+
+ await expect(
+ createTimelineActivity({
+ timelineActivityTypeUniversalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ targetObjectUniversalIdentifier: TARGET_OBJECT_UNIVERSAL_IDENTIFIER,
+ targetRecordId: '44444444-4444-4444-8444-444444444444',
+ }),
+ ).rejects.toThrow(
+ `Timeline activity type ${TYPE_UNIVERSAL_IDENTIFIER} is not installed`,
+ );
+
+ expect(fetchSpy).toHaveBeenCalledTimes(1);
+ });
+
+ it('fails before writing when the application type is inactive', async () => {
+ const createTimelineActivity = await importCreateTimelineActivity();
+
+ fetchSpy.mockResolvedValueOnce(
+ response({
+ data: {
+ timelineActivityTypes: [
+ {
+ id: TYPE_ID,
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ isActive: false,
+ },
+ ],
+ objects: { edges: [] },
+ },
+ }),
+ );
+
+ await expect(
+ createTimelineActivity({
+ timelineActivityTypeUniversalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ targetObjectUniversalIdentifier: TARGET_OBJECT_UNIVERSAL_IDENTIFIER,
+ targetRecordId: '44444444-4444-4444-8444-444444444444',
+ }),
+ ).rejects.toThrow(
+ `Timeline activity type ${TYPE_UNIVERSAL_IDENTIFIER} is inactive`,
+ );
+
+ expect(fetchSpy).toHaveBeenCalledTimes(1);
+ });
+
+ it('fails before writing when the target object is not installed', async () => {
+ const createTimelineActivity = await importCreateTimelineActivity();
+
+ fetchSpy.mockResolvedValueOnce(
+ response({
+ data: {
+ timelineActivityTypes: [
+ {
+ id: TYPE_ID,
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ isActive: true,
+ },
+ ],
+ objects: { edges: [] },
+ },
+ }),
+ );
+
+ await expect(
+ createTimelineActivity({
+ timelineActivityTypeUniversalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ targetObjectUniversalIdentifier: TARGET_OBJECT_UNIVERSAL_IDENTIFIER,
+ targetRecordId: '44444444-4444-4444-8444-444444444444',
+ }),
+ ).rejects.toThrow(
+ `Timeline activity target object ${TARGET_OBJECT_UNIVERSAL_IDENTIFIER} is not installed`,
+ );
+
+ expect(fetchSpy).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/packages/twenty-sdk/src/sdk/logic-function/timeline/create-timeline-activity.ts b/packages/twenty-sdk/src/sdk/logic-function/timeline/create-timeline-activity.ts
new file mode 100644
index 00000000000..06884fa44e4
--- /dev/null
+++ b/packages/twenty-sdk/src/sdk/logic-function/timeline/create-timeline-activity.ts
@@ -0,0 +1,137 @@
+import { MetadataApiClient } from 'twenty-client-sdk/metadata';
+import { RestApiClient } from 'twenty-client-sdk/rest';
+import { capitalize, isDefined } from 'twenty-shared/utils';
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
+
+type CreateTimelineActivityBaseInput = {
+ timelineActivityTypeUniversalIdentifier: string;
+ targetObjectUniversalIdentifier: string;
+ targetRecordId: string;
+ happensAt?: string;
+ properties?: Record<string, unknown>;
+};
+
+type CreateTimelineActivityLinkedRecordInput =
+ | {
+ linkedRecordId: string;
+ linkedObjectMetadataUniversalIdentifier: string;
+ }
+ | {
+ linkedRecordId?: never;
+ linkedObjectMetadataUniversalIdentifier?: never;
+ };
+
+export type CreateTimelineActivityInput = CreateTimelineActivityBaseInput &
+ CreateTimelineActivityLinkedRecordInput;
+
+export type CreatedTimelineActivity = {
+ id: string;
+ timelineActivityTypeId: string;
+ timelineActivityTypeSnapshot: TimelineActivityTypeSnapshot;
+};
+
+const getObjectMetadataSelection = (universalIdentifiers: string[]) => ({
+ __args: {
+ paging: {
+ first: universalIdentifiers.length,
+ },
+ filter: {
+ universalIdentifier: {
+ in: universalIdentifiers,
+ },
+ },
+ },
+ edges: {
+ node: {
+ id: true,
+ universalIdentifier: true,
+ nameSingular: true,
+ },
+ },
+});
+
+// App code addresses manifest entities by their stable universal identifier;
+// the workspace row deliberately stores the installation-specific metadata ID.
+export const createTimelineActivity = async ({
+ timelineActivityTypeUniversalIdentifier,
+ targetObjectUniversalIdentifier,
+ linkedObjectMetadataUniversalIdentifier,
+ targetRecordId,
+ ...input
+}: CreateTimelineActivityInput): Promise<CreatedTimelineActivity> => {
+ const requiredObjectUniversalIdentifiers = [
+ ...new Set(
+ [
+ targetObjectUniversalIdentifier,
+ linkedObjectMetadataUniversalIdentifier,
+ ].filter(isDefined),
+ ),
+ ];
+ const metadataClient = new MetadataApiClient();
+ const { timelineActivityTypes, objects } = await metadataClient.query({
+ timelineActivityTypes: {
+ id: true,
+ universalIdentifier: true,
+ isActive: true,
+ },
+ objects: getObjectMetadataSelection(requiredObjectUniversalIdentifiers),
+ });
+
+ const timelineActivityType = timelineActivityTypes.find(
+ ({ universalIdentifier }) =>
+ universalIdentifier === timelineActivityTypeUniversalIdentifier,
+ );
+
+ if (!isDefined(timelineActivityType)) {
+ throw new Error(
+ `Timeline activity type ${timelineActivityTypeUniversalIdentifier} is not installed`,
+ );
+ }
+
+ if (!timelineActivityType.isActive) {
+ throw new Error(
+ `Timeline activity type ${timelineActivityTypeUniversalIdentifier} is inactive`,
+ );
+ }
+
+ const objectMetadataByUniversalIdentifier = new Map(
+ objects.edges.map(({ node }) => [node.universalIdentifier, node]),
+ );
+
+ const targetObject = objectMetadataByUniversalIdentifier.get(
+ targetObjectUniversalIdentifier,
+ );
+
+ if (!isDefined(targetObject)) {
+ throw new Error(
+ `Timeline activity target object ${targetObjectUniversalIdentifier} is not installed`,
+ );
+ }
+
+ const targetFieldName = `target${capitalize(targetObject.nameSingular)}Id`;
+ const linkedObject = isDefined(linkedObjectMetadataUniversalIdentifier)
+ ? objectMetadataByUniversalIdentifier.get(
+ linkedObjectMetadataUniversalIdentifier,
+ )
+ : undefined;
+
+ if (
+ isDefined(linkedObjectMetadataUniversalIdentifier) &&
+ !isDefined(linkedObject)
+ ) {
+ throw new Error(
+ `Timeline activity linked object ${linkedObjectMetadataUniversalIdentifier} is not installed`,
+ );
+ }
+
+ const response = await new RestApiClient().post<{
+ data: { createTimelineActivity: CreatedTimelineActivity };
+ }>('/rest/timelineActivities', {
+ ...input,
+ timelineActivityTypeId: timelineActivityType.id,
+ linkedObjectMetadataId: linkedObject?.id,
+ [targetFieldName]: targetRecordId,
+ });
+
+ return response.data.createTimelineActivity;
+};
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering.ts
new file mode 100644
index 00000000000..ae37c504489
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering.ts
@@ -0,0 +1,15 @@
+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.34.0', 1787471608312)
+export class RefactorTimelineActivityTypeRenderingFastInstanceCommand implements FastInstanceCommand {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" ADD "frontComponentUniversalIdentifier" uuid');
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" DROP COLUMN "frontComponentUniversalIdentifier"');
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing.ts
new file mode 100644
index 00000000000..ffea7c45571
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing.ts
@@ -0,0 +1,17 @@
+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.34.0', 1787471608313)
+export class AddTimelineActivityRoutingFastInstanceCommand implements FastInstanceCommand {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" ADD "targetRelationFieldUniversalIdentifier" uuid');
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" ADD "triggerFieldUniversalIdentifiers" uuid[]');
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" DROP COLUMN "triggerFieldUniversalIdentifiers"');
+ await queryRunner.query('ALTER TABLE "core"."timelineActivityType" DROP COLUMN "targetRelationFieldUniversalIdentifier"');
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement.ts
new file mode 100644
index 00000000000..d32ff412919
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement.ts
@@ -0,0 +1,19 @@
+import { type QueryRunner } from 'typeorm';
+
+import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
+import { type FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
+
+@RegisteredInstanceCommand('2.34.0', 1787471608314)
+export class AddTimelineActivityTypeReplacementFastInstanceCommand implements FastInstanceCommand {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ 'ALTER TABLE "core"."timelineActivityType" ADD "replacesTimelineActivityTypeUniversalIdentifier" uuid',
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "replacesTimelineActivityTypeUniversalIdentifier"',
+ );
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity.ts
new file mode 100644
index 00000000000..e1b407301dc
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity.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.34.0', 1787471608315)
+export class TimelineActivityTypeOverridableEntityFastInstanceCommand
+ implements FastInstanceCommand
+{
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ 'ALTER TABLE "core"."timelineActivityType" ADD "overrides" jsonb, ADD "isActive" boolean NOT NULL DEFAULT true',
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "isActive", DROP COLUMN "overrides"',
+ );
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness.ts
new file mode 100644
index 00000000000..2b1ac391e89
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness.ts
@@ -0,0 +1,32 @@
+import { type QueryRunner } from 'typeorm';
+
+import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';
+import { type FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';
+
+const BASE_EMIT_SLOT_INDEX_NAME =
+ 'IDX_TIMELINE_ACTIVITY_TYPE_BASE_EMIT_SLOT_UNIQUE';
+const OVERRIDE_EMIT_SLOT_INDEX_NAME =
+ 'IDX_TIMELINE_ACTIVITY_TYPE_OVERRIDE_EMIT_SLOT_UNIQUE';
+
+@RegisteredInstanceCommand('2.34.0', 1787471608316)
+export class EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand
+ implements FastInstanceCommand
+{
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "${BASE_EMIT_SLOT_INDEX_NAME}" ON "core"."timelineActivityType" ("workspaceId", "action", "objectUniversalIdentifier", "targetRelationFieldUniversalIdentifier") NULLS NOT DISTINCT WHERE "action" IS NOT NULL AND "replacesTimelineActivityTypeUniversalIdentifier" IS NULL`,
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "${OVERRIDE_EMIT_SLOT_INDEX_NAME}" ON "core"."timelineActivityType" ("workspaceId", "action", "objectUniversalIdentifier", "targetRelationFieldUniversalIdentifier") NULLS NOT DISTINCT WHERE "action" IS NOT NULL AND "replacesTimelineActivityTypeUniversalIdentifier" IS NOT NULL`,
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ `DROP INDEX "core"."${OVERRIDE_EMIT_SLOT_INDEX_NAME}"`,
+ );
+ await queryRunner.query(
+ `DROP INDEX "core"."${BASE_EMIT_SLOT_INDEX_NAME}"`,
+ );
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-upgrade-version-command.module.ts
index b8e0ec474da..d2ff038d8ae 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-upgrade-version-command.module.ts
@@ -2,16 +2,30 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';
+import { AddTimelineActivityTypeSnapshotCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command';
+import { ConfigureTimelineActivityRoutingCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command';
+import { ConfigureStandardTimelineRenderersCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command';
import { RepairActivityTargetsJunctionTargetCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787461587487-repair-activity-targets-junction-target.command';
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';
+import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
imports: [
+ ApplicationModule,
TypeOrmModule.forFeature([FieldMetadataEntity]),
+ WorkspaceCacheModule,
WorkspaceIteratorModule,
WorkspaceMigrationRunnerModule,
+ WorkspaceMigrationModule,
+ ],
+ providers: [
+ AddTimelineActivityTypeSnapshotCommand,
+ ConfigureTimelineActivityRoutingCommand,
+ ConfigureStandardTimelineRenderersCommand,
+ RepairActivityTargetsJunctionTargetCommand,
],
- providers: [RepairActivityTargetsJunctionTargetCommand],
})
export class V2_34_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.ts
new file mode 100644
index 00000000000..786a3f53daa
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.ts
@@ -0,0 +1,172 @@
+import { Command } from 'nest-commander';
+import { isDefined } from 'twenty-shared/utils';
+
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { hasTimelineActivityObjectMetadata } from 'src/database/commands/upgrade-version-command/2-34/utils/has-timeline-activity-object-metadata.util';
+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_ROUTINGS_2_34 } from 'src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-routing-2-34.constant';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+
+const JUNCTION_TARGETS = [
+ {
+ relationFieldUniversalIdentifier: '20202020-7cff-4a74-b63c-73228448cbd9',
+ targetFieldUniversalIdentifier: '20202020-249d-4e0f-82cd-1b9df5cd3da2',
+ },
+ {
+ relationFieldUniversalIdentifier: '20202020-e07e-4ccb-88f5-6f3d00458eec',
+ targetFieldUniversalIdentifier: '20202020-5761-4842-8186-e1898ef93966',
+ },
+] as const;
+
+@RegisteredWorkspaceCommand('2.34.0', 1787471608317)
+@Command({
+ name: 'upgrade:2-34:configure-timeline-activity-routing',
+ description:
+ 'Move standard linked timeline events to the generic application contract',
+})
+export class ConfigureTimelineActivityRoutingCommand 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 ?? false) {
+ this.logger.log(
+ `[DRY RUN] Would configure generic timeline activity routing for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ const { flatObjectMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ ]);
+
+ if (!hasTimelineActivityObjectMetadata(flatObjectMetadataMaps)) {
+ this.logger.log(
+ `timelineActivity object does not exist for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ const { twentyStandardFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ const routingValueClauses = STANDARD_TIMELINE_ACTIVITY_ROUTINGS_2_34.map(
+ (_, index) =>
+ `($${index * 3 + 3}::uuid, $${index * 3 + 4}::uuid, $${index * 3 + 5}::uuid[])`,
+ ).join(', ');
+ const routingParameters = STANDARD_TIMELINE_ACTIVITY_ROUTINGS_2_34.flatMap(
+ (definition) => [
+ definition.universalIdentifier,
+ definition.targetRelationFieldUniversalIdentifier,
+ definition.triggerFieldUniversalIdentifiers ?? null,
+ ],
+ );
+
+ const queryRunner = dataSource.createQueryRunner();
+
+ try {
+ await queryRunner.connect();
+ await queryRunner.startTransaction();
+
+ const routingResult = await dataSource.query<[unknown[], number]>(
+ `UPDATE "core"."timelineActivityType" AS timeline_activity_type
+ SET "targetRelationFieldUniversalIdentifier" = routing."targetRelationFieldUniversalIdentifier",
+ "triggerFieldUniversalIdentifiers" = routing."triggerFieldUniversalIdentifiers"
+ FROM (VALUES ${routingValueClauses}) AS routing(
+ "universalIdentifier",
+ "targetRelationFieldUniversalIdentifier",
+ "triggerFieldUniversalIdentifiers"
+ )
+ WHERE timeline_activity_type."workspaceId" = $1
+ AND timeline_activity_type."applicationId" = $2
+ AND timeline_activity_type."universalIdentifier" = routing."universalIdentifier"`,
+ [workspaceId, twentyStandardFlatApplication.id, ...routingParameters],
+ queryRunner,
+ { shouldBypassPermissionChecks: true },
+ );
+
+ const junctionConditions = JUNCTION_TARGETS.map(
+ (_, index) =>
+ `(source_field."universalIdentifier" = $${index * 2 + 2}::uuid AND target_field."universalIdentifier" = $${index * 2 + 3}::uuid)`,
+ ).join(' OR ');
+
+ const junctionResult = await dataSource.query<[unknown[], number]>(
+ `UPDATE "core"."fieldMetadata" AS source_field
+ SET "settings" = COALESCE(source_field."settings", '{}'::jsonb) ||
+ jsonb_build_object('junctionTargetFieldId', target_field."id")
+ FROM "core"."fieldMetadata" AS target_field
+ WHERE source_field."workspaceId" = $1
+ AND target_field."workspaceId" = $1
+ AND (${junctionConditions})`,
+ [
+ workspaceId,
+ ...JUNCTION_TARGETS.flatMap(
+ ({
+ relationFieldUniversalIdentifier,
+ targetFieldUniversalIdentifier,
+ }) => [
+ relationFieldUniversalIdentifier,
+ targetFieldUniversalIdentifier,
+ ],
+ ),
+ ],
+ queryRunner,
+ { shouldBypassPermissionChecks: true },
+ );
+
+ validateStandardMetadataUpdateCount({
+ actualCount: routingResult[1],
+ expectedCount: STANDARD_TIMELINE_ACTIVITY_ROUTINGS_2_34.length,
+ logger: this.logger,
+ metadataLabel: 'standard timeline activity routings',
+ workspaceId,
+ });
+ validateStandardMetadataUpdateCount({
+ actualCount: junctionResult[1],
+ expectedCount: JUNCTION_TARGETS.length,
+ logger: this.logger,
+ metadataLabel: 'standard junction targets',
+ workspaceId,
+ });
+
+ await queryRunner.commitTransaction();
+ } catch (error) {
+ if (queryRunner.isTransactionActive) {
+ await queryRunner.rollbackTransaction();
+ }
+
+ throw error;
+ } finally {
+ await queryRunner.release();
+ }
+
+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
+ 'flatTimelineActivityTypeMaps',
+ 'flatFieldMetadataMaps',
+ ]);
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.ts
new file mode 100644
index 00000000000..3165568f9b9
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.ts
@@ -0,0 +1,111 @@
+import { Command } from 'nest-commander';
+import { isDefined } from 'twenty-shared/utils';
+
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { hasTimelineActivityObjectMetadata } from 'src/database/commands/upgrade-version-command/2-34/utils/has-timeline-activity-object-metadata.util';
+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 { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+
+// Replaying 2.34 must not pick up renderers introduced by a later release.
+const STANDARD_TYPES_WITH_RENDERERS = [
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0f',
+ frontComponentUniversalIdentifier: '8b4da8ed-4a87-480d-bcad-a791262cb890',
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c10',
+ frontComponentUniversalIdentifier: '3c70dd28-42f3-41da-8f41-22013d65ff50',
+ },
+] as const;
+
+@RegisteredWorkspaceCommand('2.34.0', 1787471608318)
+@Command({
+ name: 'upgrade:2-34:configure-standard-timeline-renderers',
+ description: 'Attach standard timeline previews through renderer identifiers',
+})
+export class ConfigureStandardTimelineRenderersCommand 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 ?? false) {
+ this.logger.log(
+ `[DRY RUN] Would configure standard timeline renderers for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ const { flatObjectMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ ]);
+
+ if (!hasTimelineActivityObjectMetadata(flatObjectMetadataMaps)) {
+ this.logger.log(
+ `timelineActivity object does not exist for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ const { twentyStandardFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ const values = STANDARD_TYPES_WITH_RENDERERS.map(
+ (_, index) => `($${index * 2 + 3}::uuid, $${index * 2 + 4}::uuid)`,
+ ).join(', ');
+ const parameters = STANDARD_TYPES_WITH_RENDERERS.flatMap((definition) => [
+ definition.universalIdentifier,
+ definition.frontComponentUniversalIdentifier,
+ ]);
+
+ const [, updatedRowCount] = await dataSource.query<[unknown[], number]>(
+ `UPDATE "core"."timelineActivityType" AS timeline_activity_type
+ SET "frontComponentUniversalIdentifier" = renderer."frontComponentUniversalIdentifier"
+ FROM (VALUES ${values}) AS renderer(
+ "universalIdentifier",
+ "frontComponentUniversalIdentifier"
+ )
+ WHERE timeline_activity_type."workspaceId" = $1
+ AND timeline_activity_type."applicationId" = $2
+ AND timeline_activity_type."universalIdentifier" = renderer."universalIdentifier"`,
+ [workspaceId, twentyStandardFlatApplication.id, ...parameters],
+ undefined,
+ { shouldBypassPermissionChecks: true },
+ );
+
+ await this.workspaceCacheService.invalidateAndRecompute(workspaceId, [
+ 'flatTimelineActivityTypeMaps',
+ ]);
+
+ validateStandardMetadataUpdateCount({
+ actualCount: updatedRowCount,
+ expectedCount: STANDARD_TYPES_WITH_RENDERERS.length,
+ logger: this.logger,
+ metadataLabel: 'standard timeline renderers',
+ workspaceId,
+ });
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.ts
new file mode 100644
index 00000000000..03ec3f12395
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.ts
@@ -0,0 +1,252 @@
+import { Command } from 'nest-commander';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { buildTimelineActivityTypeBackfillQuery } from 'src/database/commands/upgrade-version-command/2-33/utils/build-timeline-activity-type-backfill-query.util';
+import { hasTimelineActivityObjectMetadata } from 'src/database/commands/upgrade-version-command/2-34/utils/has-timeline-activity-object-metadata.util';
+import { buildTimelineActivityTypeSnapshotBackfillQuery } from 'src/database/commands/upgrade-version-command/2-34/utils/build-timeline-activity-type-snapshot-backfill-query.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 { 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 { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+const TIMELINE_ACTIVITY = STANDARD_OBJECTS.timelineActivity;
+const BACKFILL_BATCH_SIZE = 5000;
+@RegisteredWorkspaceCommand('2.34.0', 1787471608319)
+@Command({
+ name: 'upgrade:2-34:add-timeline-activity-type-snapshot',
+ description:
+ 'Repair rolling-upgrade rows and snapshot timeline activity type values',
+})
+export class AddTimelineActivityTypeSnapshotCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly applicationService: ApplicationService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace({
+ workspaceId,
+ dataSource,
+ options,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ const { flatObjectMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ ]);
+
+ if (!hasTimelineActivityObjectMetadata(flatObjectMetadataMaps)) {
+ this.logger.log(
+ `timelineActivity object does not exist for workspace ${workspaceId}, skipping`,
+ );
+
+ return;
+ }
+
+ if (!isDefined(dataSource)) {
+ this.logger.log(`No data source for workspace ${workspaceId}, skipping`);
+
+ return;
+ }
+
+ if (options.dryRun ?? false) {
+ this.logger.log(
+ `[DRY RUN] Would add and backfill timelineActivity.timelineActivityTypeSnapshot for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ const { twentyStandardFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+
+ await this.createSnapshotField({
+ workspaceId,
+ applicationUniversalIdentifier:
+ twentyStandardFlatApplication.universalIdentifier,
+ twentyStandardApplicationId: twentyStandardFlatApplication.id,
+ });
+
+ await this.backfillMissingTimelineActivityTypeIds({
+ workspaceId,
+ dataSource,
+ });
+ await this.backfillSnapshots({ workspaceId, dataSource });
+ }
+
+ private async createSnapshotField({
+ workspaceId,
+ applicationUniversalIdentifier,
+ twentyStandardApplicationId,
+ }: {
+ workspaceId: string;
+ applicationUniversalIdentifier: string;
+ twentyStandardApplicationId: string;
+ }): Promise<void> {
+ const { flatFieldMetadataMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatFieldMetadataMaps',
+ ]);
+
+ const snapshotFieldUniversalIdentifier =
+ TIMELINE_ACTIVITY.fields.timelineActivityTypeSnapshot
+ .universalIdentifier;
+
+ if (
+ isDefined(
+ flatFieldMetadataMaps.byUniversalIdentifier[
+ snapshotFieldUniversalIdentifier
+ ],
+ )
+ ) {
+ return;
+ }
+
+ const { allFlatEntityMaps: standardAllFlatEntityMaps } =
+ computeTwentyStandardApplicationAllFlatEntityMaps({
+ now: new Date().toISOString(),
+ workspaceId,
+ twentyStandardApplicationId,
+ });
+
+ const standardSnapshotField =
+ findFlatEntityByUniversalIdentifier<FlatFieldMetadata>({
+ flatEntityMaps: standardAllFlatEntityMaps.flatFieldMetadataMaps,
+ universalIdentifier: snapshotFieldUniversalIdentifier,
+ });
+
+ if (!isDefined(standardSnapshotField)) {
+ throw new Error(
+ 'Standard application is missing timelineActivity.timelineActivityTypeSnapshot',
+ );
+ }
+
+ const snapshotFieldToCreate = {
+ ...standardSnapshotField,
+ // Existing rows are populated before the field becomes required.
+ isNullable: true,
+ viewFieldIds: [],
+ viewFieldUniversalIdentifiers: [],
+ };
+
+ const result =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+ {
+ isSystemBuild: true,
+ workspaceId,
+ applicationUniversalIdentifier,
+ allFlatEntityOperationByMetadataName: {
+ fieldMetadata: {
+ flatEntityToCreate: [snapshotFieldToCreate],
+ flatEntityToDelete: [],
+ flatEntityToUpdate: [],
+ },
+ },
+ },
+ );
+
+ if (result.status === 'fail') {
+ throw new Error(
+ `Failed to create the timeline activity type snapshot field for workspace ${workspaceId}:\n${JSON.stringify(result, null, 2)}`,
+ );
+ }
+ }
+
+ private async backfillMissingTimelineActivityTypeIds({
+ workspaceId,
+ dataSource,
+ }: {
+ workspaceId: string;
+ dataSource: NonNullable<RunOnWorkspaceArgs['dataSource']>;
+ }): Promise<void> {
+ const { flatTimelineActivityTypeMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatTimelineActivityTypeMaps',
+ ]);
+ const backfillQuery = buildTimelineActivityTypeBackfillQuery({
+ schemaName: getWorkspaceSchemaName(workspaceId),
+ flatTimelineActivityTypeMaps,
+ batchSize: BACKFILL_BATCH_SIZE,
+ });
+
+ if (!isDefined(backfillQuery)) {
+ throw new Error(
+ `Workspace ${workspaceId} is missing the shared linked timeline activity type`,
+ );
+ }
+
+ let lastBatchRowCount = 0;
+
+ do {
+ const result = await dataSource.query(
+ backfillQuery.sql,
+ backfillQuery.parameters,
+ undefined,
+ { shouldBypassPermissionChecks: true },
+ );
+
+ lastBatchRowCount = result?.[1] ?? 0;
+ } while (lastBatchRowCount === BACKFILL_BATCH_SIZE);
+ }
+
+ private async backfillSnapshots({
+ workspaceId,
+ dataSource,
+ }: {
+ workspaceId: string;
+ dataSource: NonNullable<RunOnWorkspaceArgs['dataSource']>;
+ }): Promise<void> {
+ const schemaName = getWorkspaceSchemaName(workspaceId);
+ let backfilledRowCount = 0;
+ let lastBatchRowCount = 0;
+ let afterTimelineActivityId: string | null = null;
+
+ do {
+ const backfillQuery = buildTimelineActivityTypeSnapshotBackfillQuery({
+ schemaName,
+ batchSize: BACKFILL_BATCH_SIZE,
+ afterTimelineActivityId,
+ });
+ const [updatedTimelineActivities, updatedRowCount] =
+ await dataSource.query<[Array<{ id: string }>, number]>(
+ backfillQuery.sql,
+ backfillQuery.parameters,
+ undefined,
+ { shouldBypassPermissionChecks: true },
+ );
+
+ lastBatchRowCount = updatedRowCount;
+ backfilledRowCount += lastBatchRowCount;
+
+ if (lastBatchRowCount === BACKFILL_BATCH_SIZE) {
+ if (!isNonEmptyArray(updatedTimelineActivities)) {
+ throw new Error(
+ `Snapshot backfill for workspace ${workspaceId} updated rows without returning their identifiers`,
+ );
+ }
+
+ afterTimelineActivityId = updatedTimelineActivities.reduce(
+ (latestId, timelineActivity) =>
+ timelineActivity.id > latestId ? timelineActivity.id : latestId,
+ updatedTimelineActivities[0].id,
+ );
+ }
+ } while (lastBatchRowCount === BACKFILL_BATCH_SIZE);
+
+ this.logger.log(
+ `Backfilled ${backfilledRowCount} timeline activity type snapshots for workspace ${workspaceId}`,
+ );
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering.spec.ts
new file mode 100644
index 00000000000..eb3f9aa1030
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering.spec.ts
@@ -0,0 +1,31 @@
+import { type QueryRunner } from 'typeorm';
+
+import { RefactorTimelineActivityTypeRenderingFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering';
+
+describe('RefactorTimelineActivityTypeRenderingFastInstanceCommand', () => {
+ const query = jest.fn();
+ const queryRunner = { query } as unknown as QueryRunner;
+ const command = new RefactorTimelineActivityTypeRenderingFastInstanceCommand();
+
+ beforeEach(() => {
+ query.mockReset();
+ });
+
+ it('adds the app front component reference without dropping rolling-release storage', async () => {
+ await command.up(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" ADD "frontComponentUniversalIdentifier" uuid',
+ );
+ expect(query).toHaveBeenCalledTimes(1);
+ });
+
+ it('drops the app front component reference on rollback', async () => {
+ await command.down(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "frontComponentUniversalIdentifier"',
+ );
+ expect(query).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing.spec.ts
new file mode 100644
index 00000000000..129fc462fe5
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing.spec.ts
@@ -0,0 +1,37 @@
+import { type QueryRunner } from 'typeorm';
+
+import { AddTimelineActivityRoutingFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing';
+
+describe('AddTimelineActivityRoutingFastInstanceCommand', () => {
+ const query = jest.fn();
+ const queryRunner = { query } as unknown as QueryRunner;
+ const command = new AddTimelineActivityRoutingFastInstanceCommand();
+
+ beforeEach(() => {
+ query.mockReset();
+ });
+
+ it('adds the generic event-routing contract', async () => {
+ await command.up(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" ADD "targetRelationFieldUniversalIdentifier" uuid',
+ );
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" ADD "triggerFieldUniversalIdentifiers" uuid[]',
+ );
+ expect(query).toHaveBeenCalledTimes(2);
+ });
+
+ it('drops the generic event-routing contract on rollback', async () => {
+ await command.down(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "targetRelationFieldUniversalIdentifier"',
+ );
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "triggerFieldUniversalIdentifiers"',
+ );
+ expect(query).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement.spec.ts
new file mode 100644
index 00000000000..32c795e5732
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement.spec.ts
@@ -0,0 +1,29 @@
+import { type QueryRunner } from 'typeorm';
+
+import { AddTimelineActivityTypeReplacementFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement';
+
+describe('AddTimelineActivityTypeReplacementFastInstanceCommand', () => {
+ const query = jest.fn();
+ const queryRunner = { query } as unknown as QueryRunner;
+ const command = new AddTimelineActivityTypeReplacementFastInstanceCommand();
+
+ beforeEach(() => {
+ query.mockReset();
+ });
+
+ it('adds the explicit override reference', async () => {
+ await command.up(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" ADD "replacesTimelineActivityTypeUniversalIdentifier" uuid',
+ );
+ });
+
+ it('drops the override reference on rollback', async () => {
+ await command.down(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "replacesTimelineActivityTypeUniversalIdentifier"',
+ );
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity.spec.ts
new file mode 100644
index 00000000000..590887092f3
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity.spec.ts
@@ -0,0 +1,29 @@
+import { type QueryRunner } from 'typeorm';
+
+import { TimelineActivityTypeOverridableEntityFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity';
+
+describe('TimelineActivityTypeOverridableEntityFastInstanceCommand', () => {
+ const query = jest.fn();
+ const queryRunner = { query } as unknown as QueryRunner;
+ const command = new TimelineActivityTypeOverridableEntityFastInstanceCommand();
+
+ beforeEach(() => {
+ query.mockReset();
+ });
+
+ it('adds workspace override and active-state columns', async () => {
+ await command.up(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" ADD "overrides" jsonb, ADD "isActive" boolean NOT NULL DEFAULT true',
+ );
+ });
+
+ it('removes workspace override and active-state columns', async () => {
+ await command.down(queryRunner);
+
+ expect(query).toHaveBeenCalledWith(
+ 'ALTER TABLE "core"."timelineActivityType" DROP COLUMN "isActive", DROP COLUMN "overrides"',
+ );
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness.spec.ts
new file mode 100644
index 00000000000..33f2512b19b
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness.spec.ts
@@ -0,0 +1,46 @@
+import { type QueryRunner } from 'typeorm';
+
+import { EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness';
+
+describe('EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand', () => {
+ const query = jest.fn();
+ const queryRunner = { query } as unknown as QueryRunner;
+ const command =
+ new EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand();
+
+ beforeEach(() => {
+ query.mockReset();
+ });
+
+ it('allows one base and one override per emit slot', async () => {
+ await command.up(queryRunner);
+
+ expect(query).toHaveBeenCalledTimes(2);
+ expect(query.mock.calls[0][0]).toContain(
+ 'IDX_TIMELINE_ACTIVITY_TYPE_BASE_EMIT_SLOT_UNIQUE',
+ );
+ expect(query.mock.calls[0][0]).toContain('NULLS NOT DISTINCT');
+ expect(query.mock.calls[0][0]).toContain(
+ '"replacesTimelineActivityTypeUniversalIdentifier" IS NULL',
+ );
+ expect(query.mock.calls[1][0]).toContain(
+ 'IDX_TIMELINE_ACTIVITY_TYPE_OVERRIDE_EMIT_SLOT_UNIQUE',
+ );
+ expect(query.mock.calls[1][0]).toContain(
+ '"replacesTimelineActivityTypeUniversalIdentifier" IS NOT NULL',
+ );
+ });
+
+ it('drops both emit-slot indexes on rollback', async () => {
+ await command.down(queryRunner);
+
+ expect(query).toHaveBeenNthCalledWith(
+ 1,
+ 'DROP INDEX "core"."IDX_TIMELINE_ACTIVITY_TYPE_OVERRIDE_EMIT_SLOT_UNIQUE"',
+ );
+ expect(query).toHaveBeenNthCalledWith(
+ 2,
+ 'DROP INDEX "core"."IDX_TIMELINE_ACTIVITY_TYPE_BASE_EMIT_SLOT_UNIQUE"',
+ );
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.spec.ts
new file mode 100644
index 00000000000..5bb1b45638a
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.command.spec.ts
@@ -0,0 +1,202 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+
+import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { ConfigureTimelineActivityRoutingCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608317-configure-timeline-activity-routing.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 getOrRecomputeWithTimelineActivity = () =>
+ jest.fn().mockResolvedValue({
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [STANDARD_OBJECTS.timelineActivity.universalIdentifier]: {},
+ },
+ },
+ });
+const createTransactionalDataSource = (query: ReturnType<typeof jest.fn>) => {
+ const queryRunner = {
+ isTransactionActive: true,
+ connect: jest.fn().mockResolvedValue(undefined),
+ startTransaction: jest.fn().mockResolvedValue(undefined),
+ commitTransaction: jest.fn().mockResolvedValue(undefined),
+ rollbackTransaction: jest.fn().mockResolvedValue(undefined),
+ release: jest.fn().mockResolvedValue(undefined),
+ };
+
+ return {
+ dataSource: {
+ query,
+ createQueryRunner: jest.fn(() => queryRunner),
+ } as never,
+ queryRunner,
+ };
+};
+
+describe('ConfigureTimelineActivityRoutingCommand', () => {
+ it('backfills standard types and participant junctions into the generic contract', async () => {
+ const query = jest
+ .fn()
+ .mockResolvedValueOnce([[], 8])
+ .mockResolvedValueOnce([[], 2]);
+ const { dataSource, queryRunner } = createTransactionalDataSource(query);
+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);
+ const command = new ConfigureTimelineActivityRoutingCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest
+ .fn()
+ .mockResolvedValue({
+ twentyStandardFlatApplication: { id: STANDARD_APPLICATION_ID },
+ }),
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: getOrRecomputeWithTimelineActivity(),
+ invalidateAndRecompute,
+ } as unknown as WorkspaceCacheService,
+ );
+
+ await command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource,
+ options: {},
+ index: 0,
+ total: 1,
+ });
+
+ expect(query).toHaveBeenCalledTimes(2);
+ expect(query.mock.calls[0][0]).toContain(
+ '"targetRelationFieldUniversalIdentifier"',
+ );
+ expect(query.mock.calls[0][0]).toContain(
+ '"triggerFieldUniversalIdentifiers"',
+ );
+ 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.note.fields.noteTargets.universalIdentifier,
+ STANDARD_OBJECTS.message.fields.messageParticipants.universalIdentifier,
+ STANDARD_OBJECTS.calendarEvent.fields.calendarEventParticipants
+ .universalIdentifier,
+ ]),
+ );
+ expect(query.mock.calls[0][1]).toContainEqual([
+ STANDARD_OBJECTS.note.fields.title.universalIdentifier,
+ ]);
+ expect(query.mock.calls[1][0]).toContain('junctionTargetFieldId');
+ expect(query.mock.calls[1][1]).toEqual(
+ expect.arrayContaining([
+ STANDARD_OBJECTS.messageParticipant.fields.person.universalIdentifier,
+ STANDARD_OBJECTS.calendarEventParticipant.fields.person
+ .universalIdentifier,
+ ]),
+ );
+ expect(invalidateAndRecompute).toHaveBeenCalledWith(WORKSPACE_ID, [
+ 'flatTimelineActivityTypeMaps',
+ 'flatFieldMetadataMaps',
+ ]);
+ expect(queryRunner.commitTransaction).toHaveBeenCalledTimes(1);
+ expect(queryRunner.release).toHaveBeenCalledTimes(1);
+ });
+
+ it('does not block the fleet when optional standard metadata is missing', async () => {
+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);
+ const { dataSource } = createTransactionalDataSource(
+ jest.fn().mockResolvedValueOnce([[], 7]).mockResolvedValueOnce([[], 2]),
+ );
+ const command = new ConfigureTimelineActivityRoutingCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest
+ .fn()
+ .mockResolvedValue({
+ twentyStandardFlatApplication: { id: STANDARD_APPLICATION_ID },
+ }),
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: getOrRecomputeWithTimelineActivity(),
+ invalidateAndRecompute,
+ } as unknown as WorkspaceCacheService,
+ );
+
+ await command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource,
+ options: {},
+ index: 0,
+ total: 1,
+ });
+ expect(invalidateAndRecompute).toHaveBeenCalledTimes(1);
+ });
+
+ it('rolls back both routing updates when the junction update fails', async () => {
+ const query = jest
+ .fn()
+ .mockResolvedValueOnce([[], 8])
+ .mockRejectedValueOnce(new Error('junction update failed'));
+ const { dataSource, queryRunner } = createTransactionalDataSource(query);
+ const invalidateAndRecompute = jest.fn();
+ const command = new ConfigureTimelineActivityRoutingCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest
+ .fn()
+ .mockResolvedValue({
+ twentyStandardFlatApplication: { id: STANDARD_APPLICATION_ID },
+ }),
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: getOrRecomputeWithTimelineActivity(),
+ invalidateAndRecompute,
+ } as unknown as WorkspaceCacheService,
+ );
+
+ await expect(
+ command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource,
+ options: {},
+ index: 0,
+ total: 1,
+ }),
+ ).rejects.toThrow('junction update failed');
+
+ expect(queryRunner.rollbackTransaction).toHaveBeenCalledTimes(1);
+ expect(queryRunner.commitTransaction).not.toHaveBeenCalled();
+ expect(queryRunner.release).toHaveBeenCalledTimes(1);
+ expect(invalidateAndRecompute).not.toHaveBeenCalled();
+ });
+
+ it('skips workspaces without timeline metadata', async () => {
+ const query = jest.fn();
+ const findStandardApplication = jest.fn();
+ const command = new ConfigureTimelineActivityRoutingCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow:
+ findStandardApplication,
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: jest.fn().mockResolvedValue({
+ flatObjectMetadataMaps: { byUniversalIdentifier: {} },
+ }),
+ } as unknown as WorkspaceCacheService,
+ );
+
+ await command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource: { query } as never,
+ options: {},
+ index: 0,
+ total: 1,
+ });
+
+ expect(query).not.toHaveBeenCalled();
+ expect(findStandardApplication).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.spec.ts
new file mode 100644
index 00000000000..979226174b4
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.command.spec.ts
@@ -0,0 +1,121 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS } from 'twenty-shared/timeline';
+
+import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { ConfigureStandardTimelineRenderersCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608318-configure-standard-timeline-renderers.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 getOrRecomputeWithTimelineActivity = () =>
+ jest.fn().mockResolvedValue({
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [STANDARD_OBJECTS.timelineActivity.universalIdentifier]: {},
+ },
+ },
+ });
+
+describe('ConfigureStandardTimelineRenderersCommand', () => {
+ it('attaches trusted renderer identifiers to their standard types', async () => {
+ const query = jest.fn().mockResolvedValue([[], 2]);
+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);
+ const command = new ConfigureStandardTimelineRenderersCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest
+ .fn()
+ .mockResolvedValue({
+ twentyStandardFlatApplication: { id: STANDARD_APPLICATION_ID },
+ }),
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: getOrRecomputeWithTimelineActivity(),
+ invalidateAndRecompute,
+ } as unknown as WorkspaceCacheService,
+ );
+
+ 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(
+ '"frontComponentUniversalIdentifier"',
+ );
+ 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_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message,
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.calendarEvent,
+ ]),
+ );
+ expect(invalidateAndRecompute).toHaveBeenCalledWith(WORKSPACE_ID, [
+ 'flatTimelineActivityTypeMaps',
+ ]);
+ });
+
+ it('does not block the fleet when an optional standard renderer is missing', async () => {
+ const invalidateAndRecompute = jest.fn().mockResolvedValue(undefined);
+ const command = new ConfigureStandardTimelineRenderersCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest
+ .fn()
+ .mockResolvedValue({
+ twentyStandardFlatApplication: { id: STANDARD_APPLICATION_ID },
+ }),
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: getOrRecomputeWithTimelineActivity(),
+ invalidateAndRecompute,
+ } as unknown as WorkspaceCacheService,
+ );
+
+ await command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource: { query: jest.fn().mockResolvedValue([[], 1]) } as never,
+ options: {},
+ index: 0,
+ total: 1,
+ });
+ expect(invalidateAndRecompute).toHaveBeenCalledTimes(1);
+ });
+
+ it('skips workspaces without timeline metadata', async () => {
+ const query = jest.fn();
+ const findStandardApplication = jest.fn();
+ const command = new ConfigureStandardTimelineRenderersCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow:
+ findStandardApplication,
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: jest.fn().mockResolvedValue({
+ flatObjectMetadataMaps: { byUniversalIdentifier: {} },
+ }),
+ } as unknown as WorkspaceCacheService,
+ );
+
+ await command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource: { query } as never,
+ options: {},
+ index: 0,
+ total: 1,
+ });
+
+ expect(query).not.toHaveBeenCalled();
+ expect(findStandardApplication).not.toHaveBeenCalled();
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.spec.ts
new file mode 100644
index 00000000000..4c086efbe09
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/__tests__/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command.spec.ts
@@ -0,0 +1,170 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+
+import { type WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { AddTimelineActivityTypeSnapshotCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-workspace-command-1787471608319-add-timeline-activity-type-snapshot.command';
+import { type ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { type WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+const WORKSPACE_ID = '00000000-0000-4000-8000-000000000001';
+const APPLICATION_ID = '00000000-0000-4000-8000-000000000002';
+const APPLICATION_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000003';
+describe('AddTimelineActivityTypeSnapshotCommand', () => {
+ it('repairs rolling-upgrade rows while compatibility fields stay nullable', async () => {
+ const validateBuildAndRunWorkspaceMigration = jest
+ .fn()
+ .mockResolvedValue({ status: 'success' });
+ const query = jest.fn().mockResolvedValue([[], 0]);
+ const getOrRecompute = jest
+ .fn()
+ .mockResolvedValueOnce({
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [STANDARD_OBJECTS.timelineActivity.universalIdentifier]: {
+ id: '00000000-0000-4000-8000-000000000007',
+ universalIdentifier:
+ STANDARD_OBJECTS.timelineActivity.universalIdentifier,
+ },
+ },
+ },
+ })
+ .mockResolvedValueOnce({
+ flatFieldMetadataMaps: { byUniversalIdentifier: {} },
+ })
+ .mockResolvedValueOnce({
+ flatTimelineActivityTypeMaps: {
+ byUniversalIdentifier: {
+ linked: {
+ id: '00000000-0000-4000-8000-000000000008',
+ applicationId: APPLICATION_ID,
+ universalIdentifier:
+ '00000000-0000-4000-8000-000000000009',
+ name: 'recordLinked',
+ label: 'was linked by',
+ action: 'linked',
+ icon: null,
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ },
+ },
+ },
+ });
+ const command = new AddTimelineActivityTypeSnapshotCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest
+ .fn()
+ .mockResolvedValue({
+ twentyStandardFlatApplication: {
+ id: APPLICATION_ID,
+ universalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ }),
+ } as unknown as ApplicationService,
+ { getOrRecompute } as unknown as WorkspaceCacheService,
+ {
+ validateBuildAndRunWorkspaceMigration,
+ } as unknown as WorkspaceMigrationValidateBuildAndRunService,
+ );
+
+ await command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource: { query } as never,
+ options: {},
+ index: 0,
+ total: 1,
+ });
+
+ expect(query).toHaveBeenCalledTimes(2);
+ expect(query.mock.calls[0][0]).toContain(
+ 'WHERE "timelineActivityTypeId" IS NULL',
+ );
+ expect(query.mock.calls[1][0]).toContain(
+ 'WHERE timeline_activity."timelineActivityTypeSnapshot" IS NULL',
+ );
+
+ const createOperation =
+ validateBuildAndRunWorkspaceMigration.mock.calls[0][0]
+ .allFlatEntityOperationByMetadataName.fieldMetadata;
+ expect(createOperation.flatEntityToCreate).toEqual([
+ expect.objectContaining({
+ name: 'timelineActivityTypeSnapshot',
+ isNullable: true,
+ }),
+ ]);
+ expect(validateBuildAndRunWorkspaceMigration).toHaveBeenCalledTimes(1);
+ });
+
+ it('uses the last updated identifier to keyset large snapshot backfills', async () => {
+ const lastTimelineActivityId =
+ 'ffffffff-ffff-4fff-8fff-ffffffffffff';
+ const query = jest
+ .fn()
+ .mockResolvedValueOnce([[], 0])
+ .mockResolvedValueOnce([
+ Array.from({ length: 5000 }, () => ({ id: lastTimelineActivityId })),
+ 5000,
+ ])
+ .mockResolvedValueOnce([[], 0]);
+ const command = new AddTimelineActivityTypeSnapshotCommand(
+ {} as WorkspaceIteratorService,
+ {
+ findWorkspaceTwentyStandardAndCustomApplicationOrThrow: jest
+ .fn()
+ .mockResolvedValue({
+ twentyStandardFlatApplication: {
+ id: APPLICATION_ID,
+ universalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ }),
+ } as unknown as ApplicationService,
+ {
+ getOrRecompute: jest
+ .fn()
+ .mockResolvedValueOnce({
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [STANDARD_OBJECTS.timelineActivity.universalIdentifier]: {
+ universalIdentifier:
+ STANDARD_OBJECTS.timelineActivity.universalIdentifier,
+ },
+ },
+ },
+ })
+ .mockResolvedValueOnce({
+ flatFieldMetadataMaps: {
+ byUniversalIdentifier: {
+ [STANDARD_OBJECTS.timelineActivity.fields
+ .timelineActivityTypeSnapshot.universalIdentifier]: {},
+ },
+ },
+ })
+ .mockResolvedValueOnce({
+ flatTimelineActivityTypeMaps: {
+ byUniversalIdentifier: {
+ linked: {
+ id: '00000000-0000-4000-8000-000000000008',
+ action: 'linked',
+ objectUniversalIdentifier: null,
+ },
+ },
+ },
+ }),
+ } as unknown as WorkspaceCacheService,
+ {} as WorkspaceMigrationValidateBuildAndRunService,
+ );
+
+ await command.runOnWorkspace({
+ workspaceId: WORKSPACE_ID,
+ dataSource: { query } as never,
+ options: {},
+ index: 0,
+ total: 1,
+ });
+
+ expect(query).toHaveBeenCalledTimes(3);
+ expect(query.mock.calls[1][1]).toEqual([null, 5000]);
+ expect(query.mock.calls[2][1]).toEqual([lastTimelineActivityId, 5000]);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/timeline-activity-type-upgrade-command-name.constants.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/timeline-activity-type-upgrade-command-name.constants.ts
new file mode 100644
index 00000000000..430a69350d8
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/timeline-activity-type-upgrade-command-name.constants.ts
@@ -0,0 +1,11 @@
+export const REFACTOR_TIMELINE_ACTIVITY_TYPE_RENDERING_UPGRADE_COMMAND_NAME =
+ '2.34.0_RefactorTimelineActivityTypeRenderingFastInstanceCommand_1787471608312';
+
+export const ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME =
+ '2.34.0_AddTimelineActivityRoutingFastInstanceCommand_1787471608313';
+
+export const ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME =
+ '2.34.0_AddTimelineActivityTypeReplacementFastInstanceCommand_1787471608314';
+
+export const TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME =
+ '2.34.0_TimelineActivityTypeOverridableEntityFastInstanceCommand_1787471608315';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/__tests__/build-timeline-activity-type-snapshot-backfill-query.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/__tests__/build-timeline-activity-type-snapshot-backfill-query.util.spec.ts
new file mode 100644
index 00000000000..f7376fc26c1
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/__tests__/build-timeline-activity-type-snapshot-backfill-query.util.spec.ts
@@ -0,0 +1,29 @@
+import { buildTimelineActivityTypeSnapshotBackfillQuery } from 'src/database/commands/upgrade-version-command/2-34/utils/build-timeline-activity-type-snapshot-backfill-query.util';
+
+describe('buildTimelineActivityTypeSnapshotBackfillQuery', () => {
+ it('builds a bounded snapshot backfill for the requested workspace schema', () => {
+ const query = buildTimelineActivityTypeSnapshotBackfillQuery({
+ schemaName: 'workspace_00000000000040008000000000000001',
+ batchSize: 5000,
+ afterTimelineActivityId: null,
+ });
+
+ expect(query.sql).toContain(
+ 'FROM "workspace_00000000000040008000000000000001"."timelineActivity" timeline_activity',
+ );
+ expect(query.sql).toContain(
+ 'WHERE timeline_activity."timelineActivityTypeSnapshot" IS NULL',
+ );
+ expect(query.sql).toContain(
+ 'timeline_activity."id" > $1::uuid',
+ );
+ expect(query.sql).toContain('ORDER BY timeline_activity."id"');
+ expect(query.sql).toContain('LIMIT $2');
+ expect(query.sql).toContain('RETURNING timeline_activity."id"');
+ expect(query.sql).toContain(
+ `'frontComponentUniversalIdentifier', rows_to_update."frontComponentUniversalIdentifier"`,
+ );
+ expect(query.sql).not.toContain(`'renderer'`);
+ expect(query.parameters).toEqual([null, 5000]);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/build-timeline-activity-type-snapshot-backfill-query.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/build-timeline-activity-type-snapshot-backfill-query.util.ts
new file mode 100644
index 00000000000..aabddcd6439
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/build-timeline-activity-type-snapshot-backfill-query.util.ts
@@ -0,0 +1,44 @@
+export const buildTimelineActivityTypeSnapshotBackfillQuery = ({
+ schemaName,
+ batchSize,
+ afterTimelineActivityId,
+}: {
+ schemaName: string;
+ batchSize: number;
+ afterTimelineActivityId: string | null;
+}): { sql: string; parameters: [string | null, number] } => ({
+ sql: `WITH rows_to_update AS (
+ SELECT
+ timeline_activity."id" AS "timelineActivityId",
+ timeline_activity_type."id" AS "timelineActivityTypeId",
+ timeline_activity_type."universalIdentifier",
+ timeline_activity_type."name",
+ timeline_activity_type."label",
+ timeline_activity_type."action",
+ timeline_activity_type."icon",
+ timeline_activity_type."objectUniversalIdentifier",
+ timeline_activity_type."frontComponentUniversalIdentifier"
+ FROM "${schemaName}"."timelineActivity" timeline_activity
+ INNER JOIN "core"."timelineActivityType" timeline_activity_type
+ ON timeline_activity_type."id" = timeline_activity."timelineActivityTypeId"
+ WHERE timeline_activity."timelineActivityTypeSnapshot" IS NULL
+ AND ($1::uuid IS NULL OR timeline_activity."id" > $1::uuid)
+ ORDER BY timeline_activity."id"
+ LIMIT $2
+)
+UPDATE "${schemaName}"."timelineActivity" timeline_activity
+SET "timelineActivityTypeSnapshot" = jsonb_build_object(
+ 'id', rows_to_update."timelineActivityTypeId",
+ 'universalIdentifier', rows_to_update."universalIdentifier",
+ 'name', rows_to_update."name",
+ 'label', rows_to_update."label",
+ 'action', rows_to_update."action",
+ 'icon', rows_to_update."icon",
+ 'objectUniversalIdentifier', rows_to_update."objectUniversalIdentifier",
+ 'frontComponentUniversalIdentifier', rows_to_update."frontComponentUniversalIdentifier"
+)
+FROM rows_to_update
+WHERE timeline_activity."id" = rows_to_update."timelineActivityId"
+RETURNING timeline_activity."id"`,
+ parameters: [afterTimelineActivityId, batchSize],
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/has-timeline-activity-object-metadata.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/has-timeline-activity-object-metadata.util.ts
new file mode 100644
index 00000000000..e9be9eca669
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/has-timeline-activity-object-metadata.util.ts
@@ -0,0 +1,13 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+export const hasTimelineActivityObjectMetadata = ({
+ byUniversalIdentifier,
+}: {
+ byUniversalIdentifier: Partial<Record<string, unknown>>;
+}): boolean =>
+ isDefined(
+ byUniversalIdentifier[
+ STANDARD_OBJECTS.timelineActivity.universalIdentifier
+ ],
+ );
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/validate-standard-metadata-update-count.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/validate-standard-metadata-update-count.util.ts
new file mode 100644
index 00000000000..c030cc05d88
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-34/utils/validate-standard-metadata-update-count.util.ts
@@ -0,0 +1,27 @@
+import { type Logger } from '@nestjs/common';
+
+export const validateStandardMetadataUpdateCount = ({
+ actualCount,
+ expectedCount,
+ logger,
+ metadataLabel,
+ workspaceId,
+}: {
+ actualCount: number;
+ expectedCount: number;
+ logger: Pick<Logger, 'warn'>;
+ metadataLabel: string;
+ workspaceId: string;
+}): void => {
+ if (actualCount > expectedCount) {
+ throw new Error(
+ `Expected at most ${expectedCount} ${metadataLabel} for workspace ${workspaceId}, updated ${actualCount}`,
+ );
+ }
+
+ if (actualCount < expectedCount) {
+ logger.warn(
+ `Expected ${expectedCount} ${metadataLabel} for workspace ${workspaceId}, updated ${actualCount}; continuing because standard metadata can be absent on older workspaces`,
+ );
+ }
+};
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.ts
index 2970f0f5a42..aed2ca0dd65 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
@@ -150,6 +150,11 @@ import { AddUninstallLogicFunctionIdToApplicationFastInstanceCommand } from 'src
import { BackfillUninstallLogicFunctionIdOnApplicationSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-32/2-32-instance-command-slow-1786959731001-backfill-uninstall-logic-function-id-on-application';
import { AddUninstallHookCompletedForRequestedAtToApplicationFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-33/2-33-instance-command-fast-1787151824000-add-uninstall-hook-completed-for-requested-at-to-application';
import { AddTimelineActivityTypeTableFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-33/2-33-instance-command-fast-1787352088649-add-timeline-activity-type-table';
+import { RefactorTimelineActivityTypeRenderingFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608312-refactor-timeline-activity-type-rendering';
+import { AddTimelineActivityRoutingFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608313-add-timeline-activity-routing';
+import { AddTimelineActivityTypeReplacementFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608314-add-timeline-activity-type-replacement';
+import { TimelineActivityTypeOverridableEntityFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608315-timeline-activity-type-overridable-entity';
+import { EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-34/2-34-instance-command-fast-1787471608316-enforce-timeline-activity-type-emit-uniqueness';
export const INSTANCE_COMMANDS = [
AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,
@@ -302,4 +307,9 @@ export const INSTANCE_COMMANDS = [
BackfillUninstallLogicFunctionIdOnApplicationSlowInstanceCommand,
AddUninstallHookCompletedForRequestedAtToApplicationFastInstanceCommand,
AddTimelineActivityTypeTableFastInstanceCommand,
+ RefactorTimelineActivityTypeRenderingFastInstanceCommand,
+ AddTimelineActivityRoutingFastInstanceCommand,
+ AddTimelineActivityTypeReplacementFastInstanceCommand,
+ TimelineActivityTypeOverridableEntityFastInstanceCommand,
+ EnforceTimelineActivityTypeEmitUniquenessFastInstanceCommand,
];
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
index 6abfab96f26..5225b8ddd67 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -23,6 +23,7 @@ import { CallDatabaseEventTriggerJobsJob } from 'src/engine/core-modules/logic-f
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
import { ObjectRecordEventPublisher } from 'src/engine/subscriptions/object-record-event/object-record-event-publisher';
import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';
+import { TimelineActivityEventEligibilityService } from 'src/modules/timeline/services/timeline-activity-event-eligibility.service';
@Injectable()
export class EntityEventsToDbListener {
@@ -34,6 +35,7 @@ export class EntityEventsToDbListener {
@InjectMessageQueue(MessageQueue.triggerQueue)
private readonly triggerQueueService: MessageQueueService,
private readonly objectRecordEventPublisher: ObjectRecordEventPublisher,
+ private readonly timelineActivityEventEligibilityService: TimelineActivityEventEligibilityService,
) {}
@OnDatabaseBatchEvent('*', DatabaseEventAction.CREATED)
@@ -79,6 +81,12 @@ export class EntityEventsToDbListener {
}
const isAuditLogBatchEvent = batchEvent.objectMetadata?.isAuditLogged;
+ const shouldCreateTimelineActivity =
+ action !== DatabaseEventAction.DESTROYED &&
+ (await this.timelineActivityEventEligibilityService.shouldProcessEvent({
+ flatObjectMetadata: batchEvent.objectMetadata,
+ workspaceId: batchEvent.workspaceId,
+ }));
const batchEventForWebhook = {
...batchEvent,
@@ -107,14 +115,7 @@ export class EntityEventsToDbListener {
),
);
- if (isAuditLogBatchEvent && action !== DatabaseEventAction.DESTROYED) {
- promises.push(
- this.entityEventsToDbQueueService.add<WorkspaceEventBatch<T>>(
- CreateEventLogFromInternalEvent.name,
- batchEvent,
- ),
- );
-
+ if (shouldCreateTimelineActivity) {
promises.push(
this.entityEventsToDbQueueService.add<
WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>
@@ -125,6 +126,15 @@ export class EntityEventsToDbListener {
);
}
+ if (isAuditLogBatchEvent && action !== DatabaseEventAction.DESTROYED) {
+ promises.push(
+ this.entityEventsToDbQueueService.add<WorkspaceEventBatch<T>>(
+ CreateEventLogFromInternalEvent.name,
+ batchEvent,
+ ),
+ );
+ }
+
await Promise.all(promises);
}
}
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module.ts
index 21817196595..f0e79e7d4ba 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.module.ts
@@ -11,6 +11,7 @@ import { DashboardQueryHookModule } from 'src/modules/dashboard/query-hooks/dash
import { MessagingQueryHookModule } from 'src/modules/messaging/common/query-hooks/messaging-query-hook.module';
import { NoteQueryHookModule } from 'src/modules/note/query-hooks/note-query-hook.module';
import { TaskQueryHookModule } from 'src/modules/task/query-hooks/task-query-hook.module';
+import { TimelineQueryHookModule } from 'src/modules/timeline/query-hooks/timeline-query-hook.module';
import { WorkspaceMemberQueryHookModule } from 'src/modules/workspace-member/query-hooks/workspace-member-query-hook.module';
@Module({
@@ -22,6 +23,7 @@ import { WorkspaceMemberQueryHookModule } from 'src/modules/workspace-member/que
WorkspaceMemberQueryHookModule,
NoteQueryHookModule,
TaskQueryHookModule,
+ TimelineQueryHookModule,
DiscoveryModule,
],
providers: [
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
index d34e4d4738a..aca96187c56 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.module.ts
@@ -10,6 +10,7 @@ import { RecordTransformerModule } from 'src/engine/core-modules/record-transfor
import { TelemetryModule } from 'src/engine/core-modules/telemetry/telemetry.module';
import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';
import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';
import { EntityEventsToDbListener } from './listeners/entity-events-to-db.listener';
@@ -23,6 +24,7 @@ import { EntityEventsToDbListener } from './listeners/entity-events-to-db.listen
RecordTransformerModule,
RecordPositionModule,
SubscriptionsModule,
+ TimelineActivityModule,
],
providers: [EntityEventsToDbListener, TelemetryListener],
})
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts
index d655cfc917d..e9696ba467e 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/application-manifest-migration.service.ts
@@ -82,6 +82,7 @@ export class ApplicationManifestMigrationService {
pageLayouts: [],
pageLayoutTabs: [],
commandMenuItems: [],
+ timelineActivityTypes: [],
};
const now = new Date().toISOString();
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.ts
new file mode 100644
index 00000000000..b6cabdc5789
--- /dev/null
+++ 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
@@ -0,0 +1,104 @@
+import { fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType } from 'src/engine/core-modules/application/application-manifest/converters/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util';
+
+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 TRIGGER_UNIVERSAL_IDENTIFIER = '55555555-5555-4555-8555-555555555555';
+const REPLACED_TYPE_UNIVERSAL_IDENTIFIER =
+ '66666666-6666-4666-8666-666666666666';
+const NOW = '2026-08-22T00:00:00.000Z';
+
+describe('fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType', () => {
+ it('normalizes nested emit routing into flat metadata', () => {
+ expect(
+ fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType({
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ now: NOW,
+ timelineActivityTypeManifest: {
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ name: 'deploymentUpdated',
+ label: 'updated a deployment',
+ emit: {
+ on: 'updated',
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ through: {
+ relationFieldUniversalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,
+ triggerFieldUniversalIdentifiers: [TRIGGER_UNIVERSAL_IDENTIFIER],
+ },
+ },
+ },
+ }),
+ ).toMatchObject({
+ action: 'updated',
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ targetRelationFieldUniversalIdentifier: RELATION_UNIVERSAL_IDENTIFIER,
+ triggerFieldUniversalIdentifiers: [TRIGGER_UNIVERSAL_IDENTIFIER],
+ });
+ });
+
+ it('normalizes a type without emit as explicit-only', () => {
+ expect(
+ fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType({
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ now: NOW,
+ timelineActivityTypeManifest: {
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ name: 'deploymentCompleted',
+ label: 'completed a deployment',
+ },
+ }),
+ ).toMatchObject({
+ action: null,
+ objectUniversalIdentifier: null,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ });
+ });
+
+ it('normalizes an emitter without through routing to the source timeline', () => {
+ expect(
+ fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType({
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ now: NOW,
+ timelineActivityTypeManifest: {
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ name: 'deploymentCreated',
+ label: 'created a deployment',
+ emit: {
+ on: 'created',
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ },
+ },
+ }),
+ ).toMatchObject({
+ action: 'created',
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ });
+ });
+
+ it('maps the public replacement identifier to internal metadata', () => {
+ expect(
+ fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType({
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ now: NOW,
+ timelineActivityTypeManifest: {
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ name: 'customRecordCreated',
+ label: 'created a custom record',
+ emit: {
+ on: 'created',
+ objectUniversalIdentifier: OBJECT_UNIVERSAL_IDENTIFIER,
+ },
+ replacesTimelineActivityTypeUniversalIdentifier:
+ REPLACED_TYPE_UNIVERSAL_IDENTIFIER,
+ },
+ }),
+ ).toMatchObject({
+ replacesTimelineActivityTypeUniversalIdentifier:
+ REPLACED_TYPE_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.ts
new file mode 100644
index 00000000000..b82e01aa5ac
--- /dev/null
+++ 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
@@ -0,0 +1,38 @@
+import { type TimelineActivityTypeManifest } from 'twenty-shared/application';
+
+import { type UniversalFlatTimelineActivityType } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-timeline-activity-type.type';
+
+export const fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType =
+ ({
+ timelineActivityTypeManifest,
+ applicationUniversalIdentifier,
+ now,
+ }: {
+ timelineActivityTypeManifest: TimelineActivityTypeManifest;
+ applicationUniversalIdentifier: string;
+ now: string;
+ }): UniversalFlatTimelineActivityType => ({
+ universalIdentifier: timelineActivityTypeManifest.universalIdentifier,
+ applicationUniversalIdentifier,
+ name: timelineActivityTypeManifest.name,
+ label: timelineActivityTypeManifest.label,
+ action: timelineActivityTypeManifest.emit?.on ?? null,
+ icon: timelineActivityTypeManifest.icon ?? null,
+ frontComponentUniversalIdentifier:
+ timelineActivityTypeManifest.frontComponentUniversalIdentifier ?? null,
+ objectUniversalIdentifier:
+ timelineActivityTypeManifest.emit?.objectUniversalIdentifier ?? null,
+ targetRelationFieldUniversalIdentifier:
+ timelineActivityTypeManifest.emit?.through
+ ?.relationFieldUniversalIdentifier ?? null,
+ triggerFieldUniversalIdentifiers:
+ timelineActivityTypeManifest.emit?.through
+ ?.triggerFieldUniversalIdentifiers ?? null,
+ replacesTimelineActivityTypeUniversalIdentifier:
+ timelineActivityTypeManifest.replacesTimelineActivityTypeUniversalIdentifier ??
+ null,
+ isActive: true,
+ overrides: null,
+ createdAt: now,
+ updatedAt: now,
+ });
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/services/compute-application-manifest-all-universal-flat-entity-maps.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/services/compute-application-manifest-all-universal-flat-entity-maps.service.ts
index 70a940c18aa..f9e1f98742a 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/services/compute-application-manifest-all-universal-flat-entity-maps.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/services/compute-application-manifest-all-universal-flat-entity-maps.service.ts
@@ -29,6 +29,7 @@ import { fromRoleManifestToUniversalFlatRole } from 'src/engine/core-modules/app
import { fromRowLevelPermissionPredicateGroupManifestToUniversalFlatRowLevelPermissionPredicateGroup } from 'src/engine/core-modules/application/application-manifest/converters/from-row-level-permission-predicate-group-manifest-to-universal-flat-row-level-permission-predicate-group.util';
import { fromRowLevelPermissionPredicateManifestToUniversalFlatRowLevelPermissionPredicate } from 'src/engine/core-modules/application/application-manifest/converters/from-row-level-permission-predicate-manifest-to-universal-flat-row-level-permission-predicate.util';
import { fromSkillManifestToUniversalFlatSkill } from 'src/engine/core-modules/application/application-manifest/converters/from-skill-manifest-to-universal-flat-skill.util';
+import { fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType } from 'src/engine/core-modules/application/application-manifest/converters/from-timeline-activity-type-manifest-to-universal-flat-timeline-activity-type.util';
import { fromViewFieldGroupManifestToUniversalFlatViewFieldGroup } from 'src/engine/core-modules/application/application-manifest/converters/from-view-field-group-manifest-to-universal-flat-view-field-group.util';
import { fromViewFieldManifestToUniversalFlatViewField } from 'src/engine/core-modules/application/application-manifest/converters/from-view-field-manifest-to-universal-flat-view-field.util';
import { fromViewFilterGroupManifestToUniversalFlatViewFilterGroup } from 'src/engine/core-modules/application/application-manifest/converters/from-view-filter-group-manifest-to-universal-flat-view-filter-group.util';
@@ -643,6 +644,20 @@ export class ComputeApplicationManifestAllUniversalFlatEntityMapsService {
});
}
+ for (const timelineActivityTypeManifest of manifest.timelineActivityTypes ??
+ []) {
+ addUniversalFlatEntityToUniversalFlatEntityMapsThroughMutationOrThrow({
+ universalFlatEntity:
+ fromTimelineActivityTypeManifestToUniversalFlatTimelineActivityType({
+ timelineActivityTypeManifest,
+ applicationUniversalIdentifier,
+ now,
+ }),
+ universalFlatEntityMapsToMutate:
+ allUniversalFlatEntityMaps.flatTimelineActivityTypeMaps,
+ });
+ }
+
return allUniversalFlatEntityMaps;
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/preserve-application-local-metadata-state.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/preserve-application-local-metadata-state.util.spec.ts
new file mode 100644
index 00000000000..853788203a6
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/__tests__/preserve-application-local-metadata-state.util.spec.ts
@@ -0,0 +1,51 @@
+import { preserveApplicationLocalMetadataState } from 'src/engine/core-modules/application/application-manifest/utils/preserve-application-local-metadata-state.util';
+
+describe('preserveApplicationLocalMetadataState', () => {
+ it('keeps workspace overrides and activation while accepting app updates', () => {
+ expect(
+ preserveApplicationLocalMetadataState({
+ existingEntity: {
+ label: 'Old app label',
+ overrides: { label: 'Workspace label' },
+ isActive: false,
+ },
+ manifestEntity: {
+ label: 'New app label',
+ overrides: null,
+ isActive: true,
+ },
+ }),
+ ).toEqual({
+ label: 'New app label',
+ overrides: { label: 'Workspace label' },
+ isActive: false,
+ });
+ });
+
+ it('does not add local-state properties to metadata that does not support them', () => {
+ expect(
+ preserveApplicationLocalMetadataState({
+ existingEntity: { label: 'Old app label', isActive: false },
+ manifestEntity: { label: 'New app label', isActive: true },
+ }),
+ ).toEqual({ label: 'New app label', isActive: true });
+ });
+
+ it('preserves universal overrides used by relation-bearing metadata', () => {
+ expect(
+ preserveApplicationLocalMetadataState({
+ existingEntity: {
+ universalOverrides: { pageLayoutUniversalIdentifier: 'layout-old' },
+ isActive: false,
+ },
+ manifestEntity: {
+ universalOverrides: null,
+ isActive: true,
+ },
+ }),
+ ).toEqual({
+ universalOverrides: { pageLayoutUniversalIdentifier: 'layout-old' },
+ isActive: false,
+ });
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.ts
index 8061d9856e8..3efd9684f0c 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/build-all-flat-entity-operation-record-by-metadata-name-from-from-to.util.ts
@@ -4,6 +4,7 @@ import {
} from 'twenty-shared/metadata';
import { isDefined } from 'twenty-shared/utils';
+import { preserveApplicationLocalMetadataState } from 'src/engine/core-modules/application/application-manifest/utils/preserve-application-local-metadata-state.util';
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
import {
type AllFlatEntityOperationRecordByMetadataName,
@@ -78,13 +79,17 @@ const buildFlatEntityOperationRecordForMetadata = <T extends AllMetadataName>({
return undefined;
}
+ const toFlatEntityWithLocalState = preserveApplicationLocalMetadataState({
+ existingEntity: fromFlatEntity,
+ manifestEntity: toFlatEntity,
+ });
const update = compareTwoFlatEntity({
fromUniversalFlatEntity: fromFlatEntity,
- toUniversalFlatEntity: toFlatEntity,
+ toUniversalFlatEntity: toFlatEntityWithLocalState,
metadataName,
});
- return isDefined(update) ? toFlatEntity : undefined;
+ return isDefined(update) ? toFlatEntityWithLocalState : undefined;
})
.filter(isDefined);
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-manifest-entity-descriptor-by-universal-identifier.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-manifest-entity-descriptor-by-universal-identifier.util.ts
index bce03f23739..aa94d2d466c 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-manifest-entity-descriptor-by-universal-identifier.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/find-manifest-entity-descriptor-by-universal-identifier.util.ts
@@ -84,11 +84,13 @@ const MANIFEST_ENTITY_REGISTRY: Record<
(connectionProvider) => connectionProvider.displayName,
),
},
- // Seeded by the twenty-standard application only: an app manifest cannot
- // declare timeline activity types, so it never contributes a candidate.
timelineActivityType: {
entityKind: 'timeline activity type',
- getCandidates: () => [],
+ getCandidates: (manifest) =>
+ toCandidates(
+ manifest.timelineActivityTypes,
+ (timelineActivityType) => timelineActivityType.label,
+ ),
},
view: {
entityKind: 'view',
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/preserve-application-local-metadata-state.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/preserve-application-local-metadata-state.util.ts
new file mode 100644
index 00000000000..109c44402aa
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/utils/preserve-application-local-metadata-state.util.ts
@@ -0,0 +1,32 @@
+const APPLICATION_LOCAL_METADATA_PROPERTIES = [
+ 'overrides',
+ 'universalOverrides',
+ 'isActive',
+] as const;
+
+export const preserveApplicationLocalMetadataState = <TEntity extends object>({
+ existingEntity,
+ manifestEntity,
+}: {
+ existingEntity: TEntity;
+ manifestEntity: TEntity;
+}): TEntity => {
+ const existingEntityRecord = existingEntity as Record<string, unknown>;
+ const mergedEntityRecord = { ...manifestEntity } as Record<string, unknown>;
+ const supportsOverrides = ['overrides', 'universalOverrides'].some(
+ (property) =>
+ property in existingEntityRecord && property in mergedEntityRecord,
+ );
+
+ if (!supportsOverrides) {
+ return manifestEntity;
+ }
+
+ for (const property of APPLICATION_LOCAL_METADATA_PROPERTIES) {
+ if (property in existingEntityRecord && property in mergedEntityRecord) {
+ mergedEntityRecord[property] = existingEntityRecord[property];
+ }
+ }
+
+ return mergedEntityRecord as TEntity;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts b/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts
index d567098f00f..2999934fe78 100644
--- a/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/metrics/types/metrics-keys.type.ts
@@ -93,4 +93,5 @@ export enum MetricsKeys {
WorkspaceMigrationActionCount = 'workspace-migration/action-count',
OrmV2ReadPathUsed = 'orm-v2/read-path-used',
OrmV2WritePathUsed = 'orm-v2/write-path-used',
+ TimelineActivityMetadataIssue = 'timeline-activity/metadata-issue',
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts
index 49b308211ec..a7cd1d12d07 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/from-update-command-menu-item-input-to-flat-command-menu-item-to-update-or-throw.util.ts
@@ -72,8 +72,7 @@ export const fromUpdateCommandMenuItemInputToFlatCommandMenuItemToUpdateOrThrow
const flatCommandMenuItemToUpdate: FlatCommandMenuItem = {
...mergedRecord,
- // sanitizeOverridableEntityInput returns a loosely-typed Record overrides
- overrides: overrides as FlatCommandMenuItem['overrides'],
+ overrides,
updatedAt: new Date().toISOString(),
};
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.snap
index 92f7fda2d15..a49230c9fee 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
@@ -340,10 +340,17 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY should ma
"label",
"action",
"icon",
- "renderer",
+ "frontComponentUniversalIdentifier",
"objectUniversalIdentifier",
+ "targetRelationFieldUniversalIdentifier",
+ "triggerFieldUniversalIdentifiers",
+ "replacesTimelineActivityTypeUniversalIdentifier",
+ "isActive",
+ "overrides",
+ ],
+ "propertiesToStringify": [
+ "overrides",
],
- "propertiesToStringify": [],
},
"view": {
"propertiesToCompare": [
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap
index 92c1b5cd4e6..f852939dacf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/overridable-and-translatable-properties.constant.spec.ts.snap
@@ -58,7 +58,10 @@ exports[`registry-derived override property maps derives the overridable propert
"rowLevelPermissionPredicateGroup": [],
"searchFieldMetadata": [],
"skill": [],
- "timelineActivityType": [],
+ "timelineActivityType": [
+ "label",
+ "icon",
+ ],
"view": [
"name",
"type",
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.ts
index 07383bd5662..8a3c203d739 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
@@ -1894,14 +1894,20 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
toCompare: true,
toStringify: false,
universalProperty: undefined,
+ isOverridable: true,
},
action: {
toCompare: true,
toStringify: false,
universalProperty: undefined,
},
- icon: { toCompare: true, toStringify: false, universalProperty: undefined },
- renderer: {
+ icon: {
+ toCompare: true,
+ toStringify: false,
+ universalProperty: undefined,
+ isOverridable: true,
+ },
+ frontComponentUniversalIdentifier: {
toCompare: true,
toStringify: false,
universalProperty: undefined,
@@ -1911,6 +1917,32 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
toStringify: false,
universalProperty: undefined,
},
+ targetRelationFieldUniversalIdentifier: {
+ toCompare: true,
+ toStringify: false,
+ universalProperty: undefined,
+ },
+ triggerFieldUniversalIdentifiers: {
+ toCompare: true,
+ toStringify: false,
+ universalProperty: undefined,
+ },
+ replacesTimelineActivityTypeUniversalIdentifier: {
+ toCompare: true,
+ toStringify: false,
+ universalProperty: undefined,
+ },
+ isActive: {
+ toCompare: true,
+ toStringify: false,
+ universalProperty: undefined,
+ isOverridable: false,
+ },
+ overrides: {
+ toCompare: true,
+ toStringify: true,
+ universalProperty: undefined,
+ },
createdAt: {
toCompare: false,
toStringify: false,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts
index 57fb8696ade..e8b1da5266d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-required-metadata-for-validation.constant.ts
@@ -123,5 +123,9 @@ export const ALL_METADATA_REQUIRED_METADATA_FOR_VALIDATION = {
objectMetadata: true,
fieldMetadata: true,
},
- timelineActivityType: {},
+ timelineActivityType: {
+ objectMetadata: true,
+ fieldMetadata: true,
+ frontComponent: true,
+ },
} as const satisfies MetadataRequiredForValidation;
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-timeline-activity-type/constants/flat-timeline-activity-type-editable-properties.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-timeline-activity-type/constants/flat-timeline-activity-type-editable-properties.constant.ts
index 871bf3867e4..d2495c12107 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-timeline-activity-type/constants/flat-timeline-activity-type-editable-properties.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-timeline-activity-type/constants/flat-timeline-activity-type-editable-properties.constant.ts
@@ -5,4 +5,5 @@ export const FLAT_TIMELINE_ACTIVITY_TYPE_EDITABLE_PROPERTIES = [
'label',
'action',
'icon',
+ 'isActive',
] as const satisfies MetadataEntityPropertyName<'timelineActivityType'>[];
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-filter.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-filter.input.ts
index fce8cc2c9ee..5fc14ffad57 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-filter.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/object-filter.input.ts
@@ -15,6 +15,9 @@ export class ObjectFilterInput {
@Field(() => UUIDFilterComparisonInput, { nullable: true })
id?: UUIDFilterComparisonInput;
+ @Field(() => UUIDFilterComparisonInput, { nullable: true })
+ universalIdentifier?: UUIDFilterComparisonInput;
+
@Field(() => BooleanFieldComparisonInput, { nullable: true })
isActive?: BooleanFieldComparisonInput;
@@ -42,6 +45,7 @@ export const OBJECT_FILTER_COLUMN_BY_FILTER_FIELD: Record<
MetadataFilterColumn
> = {
id: { column: 'id', type: 'uuid' },
+ universalIdentifier: { column: 'universalIdentifier', type: 'uuid' },
isActive: { column: 'isActive', type: 'boolean' },
isRemote: { column: 'isRemote', type: 'boolean' },
isSearchable: { column: 'isSearchable', type: 'boolean' },
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-routing-2-34.constant.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-routing-2-34.constant.ts
new file mode 100644
index 00000000000..871b2fe307c
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-routing-2-34.constant.ts
@@ -0,0 +1,51 @@
+// Runtime uses this frozen copy until every workspace has completed 2.34.
+export const STANDARD_TIMELINE_ACTIVITY_ROUTINGS_2_34 = [
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c09',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-1f25-43fe-8b00-af212fdde823',
+ triggerFieldUniversalIdentifiers: null,
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0a',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-1f25-43fe-8b00-af212fdde823',
+ triggerFieldUniversalIdentifiers: null,
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0b',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-1f25-43fe-8b00-af212fdde823',
+ triggerFieldUniversalIdentifiers: ['20202020-faeb-4c76-8ba6-ccbb0b4a965f'],
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0c',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-de9c-4d0e-a452-713d4a3e5fc7',
+ triggerFieldUniversalIdentifiers: null,
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0d',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-de9c-4d0e-a452-713d4a3e5fc7',
+ triggerFieldUniversalIdentifiers: null,
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0e',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-de9c-4d0e-a452-713d4a3e5fc7',
+ triggerFieldUniversalIdentifiers: ['20202020-b386-4cb7-aa5a-08d4a4d92680'],
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c0f',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-7cff-4a74-b63c-73228448cbd9',
+ triggerFieldUniversalIdentifiers: null,
+ },
+ {
+ universalIdentifier: '20202020-0d1a-4f0e-8a55-1c0a2f0a2c10',
+ targetRelationFieldUniversalIdentifier:
+ '20202020-e07e-4ccb-88f5-6f3d00458eec',
+ triggerFieldUniversalIdentifiers: null,
+ },
+] 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.ts
index 3eca10130e6..91c4412c506 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
@@ -2,27 +2,37 @@ import { type MessageDescriptor } from '@lingui/core';
import { msg } from '@lingui/core/macro';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import {
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS,
type TimelineActivityAction,
- type TimelineActivityRenderer,
} from 'twenty-shared/timeline';
-export type StandardTimelineActivityTypeDefinition = {
+type StandardTimelineActivityTypeDefinitionSource = {
name: string;
universalIdentifier: string;
label: MessageDescriptor;
- action: TimelineActivityAction | null;
icon: string | null;
- renderer: TimelineActivityRenderer | null;
- objectUniversalIdentifier: string | null;
+ frontComponentUniversalIdentifier: string | null;
+ emit: {
+ on: TimelineActivityAction;
+ objectUniversalIdentifier: string | null;
+ through?: {
+ relationFieldUniversalIdentifier: string;
+ triggerFieldUniversalIdentifiers?: string[];
+ };
+ };
};
-// The vocabulary a timeline row is stamped from. Types carrying an object are
-// preferred for events about that object's records, so a note link renders
-// through its own component; the ones carrying none are the fallback for every
-// other object and for a record's own changes. The stored `name` column these
-// replace conflated the action with the source object and could not tell a
-// linked record being deleted from the link itself being removed.
-export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivityTypeDefinition[] =
+export type StandardTimelineActivityTypeDefinition =
+ StandardTimelineActivityTypeDefinitionSource & {
+ action: TimelineActivityAction;
+ objectUniversalIdentifier: string | null;
+ targetRelationFieldUniversalIdentifier?: string;
+ triggerFieldUniversalIdentifiers?: string[];
+ };
+
+// Standard wildcard emitters supply platform fallbacks when no object-specific
+// type owns the slot. Application manifests require an object on every emitter.
+const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITION_SOURCES: StandardTimelineActivityTypeDefinitionSource[] =
[
{
name: 'recordCreated',
@@ -31,10 +41,9 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `was created by`,
context: 'timelineActivityType.label',
}),
- action: 'created',
icon: 'IconCirclePlus',
- renderer: null,
- objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ emit: { on: 'created', objectUniversalIdentifier: null },
},
{
name: 'recordUpdated',
@@ -43,10 +52,9 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `updated`,
context: 'timelineActivityType.label',
}),
- action: 'updated',
icon: 'IconEditCircle',
- renderer: null,
- objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ emit: { on: 'updated', objectUniversalIdentifier: null },
},
{
name: 'recordDeleted',
@@ -55,10 +63,9 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `was deleted by`,
context: 'timelineActivityType.label',
}),
- action: 'deleted',
icon: 'IconTrash',
- renderer: null,
- objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ emit: { on: 'deleted', objectUniversalIdentifier: null },
},
{
name: 'recordRestored',
@@ -67,10 +74,9 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `was restored by`,
context: 'timelineActivityType.label',
}),
- action: 'restored',
icon: 'IconRestore',
- renderer: null,
- objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ emit: { on: 'restored', objectUniversalIdentifier: null },
},
{
name: 'recordLinked',
@@ -79,10 +85,9 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `was linked by`,
context: 'timelineActivityType.label',
}),
- action: 'linked',
icon: 'IconLink',
- renderer: null,
- objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ emit: { on: 'linked', objectUniversalIdentifier: null },
},
{
name: 'recordUnlinked',
@@ -91,10 +96,9 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `was unlinked by`,
context: 'timelineActivityType.label',
}),
- action: 'unlinked',
icon: 'IconUnlink',
- renderer: null,
- objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ emit: { on: 'unlinked', objectUniversalIdentifier: null },
},
{
name: 'noteLinked',
@@ -103,10 +107,16 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `linked a related note`,
context: 'timelineActivityType.label',
}),
- action: 'linked',
icon: 'IconLink',
- renderer: 'activity',
- objectUniversalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,
+ frontComponentUniversalIdentifier: null,
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.note.fields.noteTargets.universalIdentifier,
+ },
+ },
},
{
name: 'noteUnlinked',
@@ -115,10 +125,16 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `unlinked a related note`,
context: 'timelineActivityType.label',
}),
- action: 'unlinked',
icon: 'IconUnlink',
- renderer: 'activity',
- objectUniversalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,
+ frontComponentUniversalIdentifier: null,
+ emit: {
+ on: 'unlinked',
+ objectUniversalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.note.fields.noteTargets.universalIdentifier,
+ },
+ },
},
{
name: 'noteUpdated',
@@ -127,10 +143,19 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `updated a related note`,
context: 'timelineActivityType.label',
}),
- action: 'updated',
icon: 'IconEditCircle',
- renderer: 'activity',
- objectUniversalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,
+ frontComponentUniversalIdentifier: null,
+ emit: {
+ on: 'updated',
+ objectUniversalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.note.fields.noteTargets.universalIdentifier,
+ triggerFieldUniversalIdentifiers: [
+ STANDARD_OBJECTS.note.fields.title.universalIdentifier,
+ ],
+ },
+ },
},
{
name: 'taskLinked',
@@ -139,10 +164,16 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `linked a related task`,
context: 'timelineActivityType.label',
}),
- action: 'linked',
icon: 'IconLink',
- renderer: 'activity',
- objectUniversalIdentifier: STANDARD_OBJECTS.task.universalIdentifier,
+ frontComponentUniversalIdentifier: null,
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier: STANDARD_OBJECTS.task.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.task.fields.taskTargets.universalIdentifier,
+ },
+ },
},
{
name: 'taskUnlinked',
@@ -151,10 +182,16 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `unlinked a related task`,
context: 'timelineActivityType.label',
}),
- action: 'unlinked',
icon: 'IconUnlink',
- renderer: 'activity',
- objectUniversalIdentifier: STANDARD_OBJECTS.task.universalIdentifier,
+ frontComponentUniversalIdentifier: null,
+ emit: {
+ on: 'unlinked',
+ objectUniversalIdentifier: STANDARD_OBJECTS.task.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.task.fields.taskTargets.universalIdentifier,
+ },
+ },
},
{
name: 'taskUpdated',
@@ -163,10 +200,19 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `updated a related task`,
context: 'timelineActivityType.label',
}),
- action: 'updated',
icon: 'IconEditCircle',
- renderer: 'activity',
- objectUniversalIdentifier: STANDARD_OBJECTS.task.universalIdentifier,
+ frontComponentUniversalIdentifier: null,
+ emit: {
+ on: 'updated',
+ objectUniversalIdentifier: STANDARD_OBJECTS.task.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.task.fields.taskTargets.universalIdentifier,
+ triggerFieldUniversalIdentifiers: [
+ STANDARD_OBJECTS.task.fields.title.universalIdentifier,
+ ],
+ },
+ },
},
{
name: 'messageLinked',
@@ -175,10 +221,18 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `sent or received an email`,
context: 'timelineActivityType.label',
}),
- action: 'linked',
icon: 'IconMail',
- renderer: 'message',
- objectUniversalIdentifier: STANDARD_OBJECTS.message.universalIdentifier,
+ frontComponentUniversalIdentifier:
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message,
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier: STANDARD_OBJECTS.message.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.message.fields.messageParticipants
+ .universalIdentifier,
+ },
+ },
},
{
name: 'calendarEventLinked',
@@ -187,10 +241,31 @@ export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivi
message: `attended a calendar event`,
context: 'timelineActivityType.label',
}),
- action: 'linked',
icon: 'IconCalendar',
- renderer: 'calendarEvent',
- objectUniversalIdentifier:
- STANDARD_OBJECTS.calendarEvent.universalIdentifier,
+ frontComponentUniversalIdentifier:
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.calendarEvent,
+ emit: {
+ on: 'linked',
+ objectUniversalIdentifier:
+ STANDARD_OBJECTS.calendarEvent.universalIdentifier,
+ through: {
+ relationFieldUniversalIdentifier:
+ STANDARD_OBJECTS.calendarEvent.fields.calendarEventParticipants
+ .universalIdentifier,
+ },
+ },
},
];
+
+// The normalized properties keep the committed 2.34 workspace command stable;
+// current builders and app declarations read the nested emit contract.
+export const STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS: StandardTimelineActivityTypeDefinition[] =
+ STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITION_SOURCES.map((definition) => ({
+ ...definition,
+ action: definition.emit.on,
+ objectUniversalIdentifier: definition.emit.objectUniversalIdentifier,
+ targetRelationFieldUniversalIdentifier:
+ definition.emit.through?.relationFieldUniversalIdentifier,
+ triggerFieldUniversalIdentifiers:
+ definition.emit.through?.triggerFieldUniversalIdentifiers,
+ }));
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.ts
new file mode 100644
index 00000000000..700e67f20bf
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type-emit.dto.ts
@@ -0,0 +1,34 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
+import { type TimelineActivityAction } from 'twenty-shared/timeline';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ObjectType('TimelineActivityTypeEmitThrough')
+export class TimelineActivityTypeEmitThroughDTO {
+ @IsUUID()
+ @IsNotEmpty()
+ @Field(() => UUIDScalarType)
+ relationFieldUniversalIdentifier: string;
+
+ @IsOptional()
+ @Field(() => [UUIDScalarType], { nullable: true })
+ triggerFieldUniversalIdentifiers: string[] | null;
+}
+
+@ObjectType('TimelineActivityTypeEmit')
+export class TimelineActivityTypeEmitDTO {
+ @IsNotEmpty()
+ @Field(() => String)
+ on: TimelineActivityAction;
+
+ @IsOptional()
+ @IsUUID()
+ @Field(() => UUIDScalarType, { nullable: true })
+ objectUniversalIdentifier: string | null;
+
+ @IsOptional()
+ @Field(() => TimelineActivityTypeEmitThroughDTO, { nullable: true })
+ through: TimelineActivityTypeEmitThroughDTO | null;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts
index acea9c3fd42..ef486fe5ca3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto.ts
@@ -1,12 +1,17 @@
import { Field, HideField, ObjectType } from '@nestjs/graphql';
-import { IsDateString, IsNotEmpty, IsOptional, IsUUID } from 'class-validator';
import {
- type TimelineActivityAction,
- type TimelineActivityRenderer,
-} from 'twenty-shared/timeline';
+ IsBoolean,
+ IsDateString,
+ IsNotEmpty,
+ IsOptional,
+ IsUUID,
+} from 'class-validator';
+import { type TimelineActivityAction } from 'twenty-shared/timeline';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { TimelineActivityTypeEmitDTO } from 'src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type-emit.dto';
+import { type TimelineActivityTypeOverrides } from 'src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity';
@ObjectType('TimelineActivityType')
export class TimelineActivityTypeDTO {
@@ -15,6 +20,11 @@ export class TimelineActivityTypeDTO {
@Field(() => UUIDScalarType)
id: string;
+ @IsUUID()
+ @IsNotEmpty()
+ @Field(() => UUIDScalarType)
+ universalIdentifier: string;
+
@IsNotEmpty()
@Field()
name: string;
@@ -23,31 +33,57 @@ export class TimelineActivityTypeDTO {
@Field()
label: string;
- // Explicit type: the action union is erased at runtime, so reflection cannot
- // infer a GraphQL type from it.
@IsOptional()
- @Field(() => String, { nullable: true })
+ @Field(() => TimelineActivityTypeEmitDTO, { nullable: true })
+ emit: TimelineActivityTypeEmitDTO | null;
+
+ @IsOptional()
+ @Field(() => String, {
+ nullable: true,
+ deprecationReason: 'Use emit.on',
+ })
action: TimelineActivityAction | null;
@IsOptional()
@Field(() => String, { nullable: true })
icon: string | null;
- // Explicit type for the same reason as action: the renderer union is erased.
@IsOptional()
- @Field(() => String, { nullable: true })
- renderer: TimelineActivityRenderer | null;
+ @Field(() => String, {
+ nullable: true,
+ deprecationReason: 'Use frontComponentUniversalIdentifier',
+ })
+ renderer: string | null;
@IsOptional()
+ @IsUUID()
@Field(() => UUIDScalarType, { nullable: true })
+ frontComponentUniversalIdentifier: string | null;
+
+ @IsOptional()
+ @Field(() => UUIDScalarType, {
+ nullable: true,
+ deprecationReason: 'Use emit.objectUniversalIdentifier',
+ })
objectUniversalIdentifier: string | null;
+ @IsOptional()
+ @Field(() => UUIDScalarType, { nullable: true })
+ replacesTimelineActivityTypeUniversalIdentifier: string | null;
+
+ @IsBoolean()
+ @Field()
+ isActive: boolean;
+
@HideField()
workspaceId: string;
@Field(() => UUIDScalarType, { nullable: true })
applicationId?: string;
+ @HideField()
+ overrides: TimelineActivityTypeOverrides | null;
+
@IsDateString()
@Field()
createdAt: Date;
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input.ts
new file mode 100644
index 00000000000..d0a0d361d97
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input.ts
@@ -0,0 +1,43 @@
+import { Field, InputType } from '@nestjs/graphql';
+import { Type } from 'class-transformer';
+import {
+ IsBoolean,
+ IsNotEmpty,
+ IsOptional,
+ IsString,
+ IsUUID,
+ ValidateNested,
+} from 'class-validator';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { MetadataTranslationOverrideInput } from 'src/engine/metadata-modules/metadata-translation/dtos/metadata-translation-override.input';
+
+@InputType()
+export class UpdateTimelineActivityTypeInput {
+ @IsUUID()
+ @IsNotEmpty()
+ @Field(() => UUIDScalarType)
+ id: string;
+
+ @IsString()
+ @IsNotEmpty()
+ @IsOptional()
+ @Field({ nullable: true })
+ label?: string;
+
+ @IsString()
+ @IsOptional()
+ @Field(() => String, { nullable: true })
+ icon?: string | null;
+
+ @IsBoolean()
+ @IsOptional()
+ @Field({ nullable: true })
+ isActive?: boolean;
+
+ @Type(() => MetadataTranslationOverrideInput)
+ @ValidateNested({ each: true })
+ @IsOptional()
+ @Field(() => [MetadataTranslationOverrideInput], { nullable: true })
+ translations?: MetadataTranslationOverrideInput[];
+}
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.ts
new file mode 100644
index 00000000000..bdfbb4e43da
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/entities/__tests__/timeline-activity-type-upgrade-shape.spec.ts
@@ -0,0 +1,79 @@
+import {
+ ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,
+ ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME,
+ REFACTOR_TIMELINE_ACTIVITY_TYPE_RENDERING_UPGRADE_COMMAND_NAME,
+ 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 { 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';
+
+const CURRENT_COLUMNS = [
+ 'frontComponentUniversalIdentifier',
+ 'targetRelationFieldUniversalIdentifier',
+ 'triggerFieldUniversalIdentifiers',
+ 'replacesTimelineActivityTypeUniversalIdentifier',
+ 'overrides',
+ 'isActive',
+].map((propertyName) => ({ propertyName, databaseName: propertyName }));
+
+const resolveAt = (appliedSteps: string[]) =>
+ resolveEntityShapeAtUpgradeCursor({
+ entityClass: TimelineActivityTypeEntity,
+ currentTableName: 'timelineActivityType',
+ currentColumns: CURRENT_COLUMNS,
+ isStepApplied: (stepName) => appliedSteps.includes(stepName),
+ });
+
+describe('TimelineActivityTypeEntity upgrade shape', () => {
+ it('hides every 2.34 column while 2.33 workspace commands run', () => {
+ expect(resolveAt([]).hiddenPropertyNames).toEqual(
+ new Set(CURRENT_COLUMNS.map(({ propertyName }) => propertyName)),
+ );
+ });
+
+ it('reveals each column only after its instance command', () => {
+ expect(
+ resolveAt([
+ REFACTOR_TIMELINE_ACTIVITY_TYPE_RENDERING_UPGRADE_COMMAND_NAME,
+ ]).hiddenPropertyNames,
+ ).toEqual(
+ new Set([
+ 'targetRelationFieldUniversalIdentifier',
+ 'triggerFieldUniversalIdentifiers',
+ 'replacesTimelineActivityTypeUniversalIdentifier',
+ 'overrides',
+ 'isActive',
+ ]),
+ );
+
+ expect(
+ resolveAt([
+ REFACTOR_TIMELINE_ACTIVITY_TYPE_RENDERING_UPGRADE_COMMAND_NAME,
+ ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME,
+ ]).hiddenPropertyNames,
+ ).toEqual(
+ new Set([
+ 'replacesTimelineActivityTypeUniversalIdentifier',
+ 'overrides',
+ 'isActive',
+ ]),
+ );
+
+ 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,
+ ]).hiddenPropertyNames,
+ ).toEqual(new Set(['overrides', 'isActive']));
+
+ 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,
+ ]).hiddenPropertyNames,
+ ).toEqual(new Set());
+ });
+});
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.ts
index 258ebd56259..9519968babf 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
@@ -1,17 +1,33 @@
-import {
- type TimelineActivityAction,
- type TimelineActivityRenderer,
-} from 'twenty-shared/timeline';
+import { type TimelineActivityAction } from 'twenty-shared/timeline';
+import { type APP_LOCALES } from 'twenty-shared/translations';
import {
Column,
CreateDateColumn,
Entity,
+ Index,
PrimaryGeneratedColumn,
Unique,
UpdateDateColumn,
} from 'typeorm';
-import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-entity.interface';
+import {
+ ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,
+ ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME,
+ REFACTOR_TIMELINE_ACTIVITY_TYPE_RENDERING_UPGRADE_COMMAND_NAME,
+ 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 { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
+import { type WasRemovedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-removed-in-upgrade.decorator';
+
+import { OverridableEntity } from 'src/engine/workspace-manager/types/overridable-entity';
+
+export type TimelineActivityTypeOverrides = {
+ label?: string;
+ icon?: string | null;
+ translations?: Partial<
+ Record<keyof typeof APP_LOCALES, { label?: string | null }>
+ > | null;
+};
@Entity({ name: 'timelineActivityType', schema: 'core' })
@Unique('IDX_TIMELINE_ACTIVITY_TYPE_NAME_APPLICATION_WORKSPACE_UNIQUE', [
@@ -19,8 +35,14 @@ import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-enti
'applicationId',
'workspaceId',
])
+@Index('IDX_TIMELINE_ACTIVITY_TYPE_BASE_EMIT_SLOT_UNIQUE', {
+ synchronize: false,
+})
+@Index('IDX_TIMELINE_ACTIVITY_TYPE_OVERRIDE_EMIT_SLOT_UNIQUE', {
+ synchronize: false,
+})
export class TimelineActivityTypeEntity
- extends SyncableEntity
+ extends OverridableEntity<TimelineActivityTypeOverrides>
implements Required<TimelineActivityTypeEntity>
{
@PrimaryGeneratedColumn('uuid')
@@ -32,18 +54,28 @@ export class TimelineActivityTypeEntity
@Column({ nullable: false, type: 'varchar' })
label: string;
- // The verb the entry describes. Null leaves the label authoritative for a
- // custom renderer instead of selecting built-in action copy.
+ // The verb used by automatic audit writers to resolve a type. Null leaves
+ // the type available only to explicit writers addressing its identifier.
@Column({ nullable: true, type: 'varchar' })
action: TimelineActivityAction | null;
@Column({ nullable: true, type: 'varchar' })
icon: string | null;
- // Names the frontend component that draws the row. Null falls back to the
- // generic renderer, which needs nothing but the label and icon.
+ // A 2.33 server still selects this column during a rolling deployment. It is
+ // no longer mapped into current metadata. The decorator and physical drop
+ // are both deferred to 2.35; the branded type lets flat builders omit it.
@Column({ nullable: true, type: 'varchar' })
- renderer: TimelineActivityRenderer | null;
+ renderer: WasRemovedInUpgrade<string | null>;
+
+ @WasIntroducedInUpgrade({
+ upgradeCommandName:
+ REFACTOR_TIMELINE_ACTIVITY_TYPE_RENDERING_UPGRADE_COMMAND_NAME,
+ })
+ // Native renderers reserve identifiers in this namespace so snapshots use
+ // the same live-first resolution path as application front components.
+ @Column({ nullable: true, type: 'uuid' })
+ frontComponentUniversalIdentifier: string | null;
// The object whose records this entry is about, as a soft reference rather
// than a relation: it is resolved through the flat maps at write time to pick
@@ -51,9 +83,37 @@ export class TimelineActivityTypeEntity
@Column({ nullable: true, type: 'uuid' })
objectUniversalIdentifier: string | null;
+ @WasIntroducedInUpgrade({
+ upgradeCommandName: ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME,
+ })
+ @Column({ nullable: true, type: 'uuid' })
+ targetRelationFieldUniversalIdentifier: string | null;
+
+ @WasIntroducedInUpgrade({
+ upgradeCommandName: ADD_TIMELINE_ACTIVITY_ROUTING_UPGRADE_COMMAND_NAME,
+ })
+ @Column({ nullable: true, type: 'uuid', array: true })
+ triggerFieldUniversalIdentifiers: string[] | null;
+
+ @WasIntroducedInUpgrade({
+ upgradeCommandName:
+ ADD_TIMELINE_ACTIVITY_TYPE_REPLACEMENT_UPGRADE_COMMAND_NAME,
+ })
+ @Column({ nullable: true, type: 'uuid' })
+ replacesTimelineActivityTypeUniversalIdentifier: string | null;
+
@CreateDateColumn({ type: 'timestamptz' })
createdAt: Date;
@UpdateDateColumn({ type: 'timestamptz' })
updatedAt: Date;
}
+
+WasIntroducedInUpgrade({
+ upgradeCommandName:
+ TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME,
+})(TimelineActivityTypeEntity.prototype, 'overrides');
+WasIntroducedInUpgrade({
+ upgradeCommandName:
+ TIMELINE_ACTIVITY_TYPE_OVERRIDABLE_ENTITY_UPGRADE_COMMAND_NAME,
+})(TimelineActivityTypeEntity.prototype, 'isActive');
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum.ts
index 92f08485267..f579503d136 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum.ts
@@ -2,4 +2,5 @@ export enum TimelineActivityTypeExceptionCode {
TIMELINE_ACTIVITY_TYPE_NOT_FOUND = 'TIMELINE_ACTIVITY_TYPE_NOT_FOUND',
TIMELINE_ACTIVITY_TYPE_NAME_ALREADY_EXISTS = 'TIMELINE_ACTIVITY_TYPE_NAME_ALREADY_EXISTS',
INVALID_TIMELINE_ACTIVITY_TYPE_INPUT = 'INVALID_TIMELINE_ACTIVITY_TYPE_INPUT',
+ TIMELINE_ACTIVITY_TYPE_CANNOT_BE_RESET = 'TIMELINE_ACTIVITY_TYPE_CANNOT_BE_RESET',
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/interceptors/timeline-activity-type-graphql-api-exception.interceptor.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/interceptors/timeline-activity-type-graphql-api-exception.interceptor.ts
new file mode 100644
index 00000000000..ec5cdcc313a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/interceptors/timeline-activity-type-graphql-api-exception.interceptor.ts
@@ -0,0 +1,21 @@
+import {
+ type CallHandler,
+ type ExecutionContext,
+ Injectable,
+ type NestInterceptor,
+} from '@nestjs/common';
+import { type Observable, catchError } from 'rxjs';
+
+import { timelineActivityTypeGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/timeline-activity-type/utils/timeline-activity-type-graphql-api-exception-handler.util';
+
+@Injectable()
+export class TimelineActivityTypeGraphqlApiExceptionInterceptor implements NestInterceptor {
+ intercept(
+ _context: ExecutionContext,
+ next: CallHandler,
+ ): Observable<unknown> {
+ return next
+ .handle()
+ .pipe(catchError(timelineActivityTypeGraphqlApiExceptionHandler));
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.exception.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.exception.ts
new file mode 100644
index 00000000000..ef7a0ee459a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.exception.ts
@@ -0,0 +1,37 @@
+import { type MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+import { assertUnreachable } from 'twenty-shared/utils';
+
+import { TimelineActivityTypeExceptionCode } from 'src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum';
+import { CustomException } from 'src/utils/custom-exception';
+
+const getTimelineActivityTypeExceptionUserFriendlyMessage = (
+ code: TimelineActivityTypeExceptionCode,
+) => {
+ switch (code) {
+ case TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NOT_FOUND:
+ return msg`Timeline activity type not found.`;
+ case TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_CANNOT_BE_RESET:
+ return msg`Custom timeline activity type cannot be reset to default.`;
+ case TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NAME_ALREADY_EXISTS:
+ return msg`Timeline activity type name already exists.`;
+ case TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT:
+ return msg`Invalid timeline activity type input.`;
+ default:
+ assertUnreachable(code);
+ }
+};
+
+export class TimelineActivityTypeException extends CustomException<TimelineActivityTypeExceptionCode> {
+ constructor(
+ message: string,
+ code: TimelineActivityTypeExceptionCode,
+ { userFriendlyMessage }: { userFriendlyMessage?: MessageDescriptor } = {},
+ ) {
+ super(message, code, {
+ userFriendlyMessage:
+ userFriendlyMessage ??
+ getTimelineActivityTypeExceptionUserFriendlyMessage(code),
+ });
+ }
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts
index 078a493e960..ff369b2c1aa 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.module.ts
@@ -1,16 +1,29 @@
import { Module } from '@nestjs/common';
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';
import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
+import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { TimelineActivityTypeResolver } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver';
import { TimelineActivityTypeService } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service';
+import { TimelineActivityTypeGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/timeline-activity-type/interceptors/timeline-activity-type-graphql-api-exception.interceptor';
+import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
+import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@Module({
imports: [
ApplicationTranslationCatalogModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
+ ApplicationModule,
+ PermissionsModule,
+ WorkspaceMigrationModule,
+ ],
+ providers: [
+ TimelineActivityTypeService,
+ TimelineActivityTypeResolver,
+ TimelineActivityTypeGraphqlApiExceptionInterceptor,
+ WorkspaceMigrationGraphqlApiExceptionInterceptor,
],
- providers: [TimelineActivityTypeService, TimelineActivityTypeResolver],
exports: [TimelineActivityTypeService],
})
export class TimelineActivityTypeModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts
index a239fc6a679..01d9943f3a0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.resolver.ts
@@ -1,21 +1,39 @@
-import { UseGuards } from '@nestjs/common';
-import { Context, Parent, Query, ResolveField } from '@nestjs/graphql';
+import { UseGuards, UseInterceptors } from '@nestjs/common';
+import {
+ Args,
+ Context,
+ Mutation,
+ Parent,
+ Query,
+ ResolveField,
+} from '@nestjs/graphql';
import { isNonEmptyString } from '@sniptt/guards';
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { PermissionFlagType } from 'twenty-shared/constants';
+
import { NoPermissionGuard } from 'src/engine/guards/no-permission.guard';
+import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';
import { TimelineActivityTypeDTO } from 'src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto';
+import { UpdateTimelineActivityTypeInput } from 'src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input';
+import { TimelineActivityTypeGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/timeline-activity-type/interceptors/timeline-activity-type-graphql-api-exception.interceptor';
import { TimelineActivityTypeService } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service';
import { resolveEffectiveEntityProperty } from 'src/engine/metadata-modules/utils/resolve-effective-entity-property.util';
+import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
@UseGuards(WorkspaceAuthGuard)
+@UseInterceptors(
+ WorkspaceMigrationGraphqlApiExceptionInterceptor,
+ TimelineActivityTypeGraphqlApiExceptionInterceptor,
+)
@MetadataResolver(() => TimelineActivityTypeDTO)
export class TimelineActivityTypeResolver {
constructor(
@@ -36,9 +54,7 @@ export class TimelineActivityTypeResolver {
return resolveEffectiveEntityProperty({
metadataName: 'timelineActivityType',
baseValue: timelineActivityType.label,
- // A timeline activity type carries no overrides: a workspace that wants
- // different wording edits the row, leaving nothing to arbitrate against.
- overrides: undefined,
+ overrides: timelineActivityType.overrides,
property: 'label',
i18nContext:
await this.applicationTranslationCatalogService.buildEffectiveEntityI18nContext(
@@ -61,4 +77,28 @@ export class TimelineActivityTypeResolver {
workspaceId: workspace.id,
});
}
+
+ @Mutation(() => TimelineActivityTypeDTO)
+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
+ async updateTimelineActivityType(
+ @Args('input') input: UpdateTimelineActivityTypeInput,
+ @AuthWorkspace() workspace: WorkspaceEntity,
+ ): Promise<TimelineActivityTypeDTO> {
+ return this.timelineActivityTypeService.update({
+ input,
+ workspaceId: workspace.id,
+ });
+ }
+
+ @Mutation(() => TimelineActivityTypeDTO)
+ @UseGuards(SettingsPermissionGuard(PermissionFlagType.APPLICATIONS))
+ async resetTimelineActivityType(
+ @Args('id', { type: () => UUIDScalarType }) id: string,
+ @AuthWorkspace() workspace: WorkspaceEntity,
+ ): Promise<TimelineActivityTypeDTO> {
+ return this.timelineActivityTypeService.reset({
+ id,
+ workspaceId: workspace.id,
+ });
+ }
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts
index 20232537a8f..5e04e773fc9 100644
--- a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.service.ts
@@ -2,14 +2,26 @@ import { Injectable } from '@nestjs/common';
import { isDefined } from 'twenty-shared/utils';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
import { type TimelineActivityTypeDTO } from 'src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto';
+import { type UpdateTimelineActivityTypeInput } from 'src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input';
+import { TimelineActivityTypeExceptionCode } from 'src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum';
+import { TimelineActivityTypeException } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.exception';
import { fromFlatTimelineActivityTypeToTimelineActivityTypeDto } from 'src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util';
+import { fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow } from 'src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util';
+import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
@Injectable()
export class TimelineActivityTypeService {
constructor(
private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ private readonly applicationService: ApplicationService,
) {}
async findAll({
@@ -27,4 +39,138 @@ export class TimelineActivityTypeService {
.sort((a, b) => a.name.localeCompare(b.name))
.map(fromFlatTimelineActivityTypeToTimelineActivityTypeDto);
}
+
+ async update({
+ input,
+ workspaceId,
+ }: {
+ input: UpdateTimelineActivityTypeInput;
+ workspaceId: string;
+ }): Promise<TimelineActivityTypeDTO> {
+ const { workspaceCustomFlatApplication, flatTimelineActivityTypeMaps } =
+ await this.getWorkspaceUpdateContext(workspaceId);
+ const flatTimelineActivityTypeToUpdate =
+ fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow(
+ {
+ flatTimelineActivityTypeMaps,
+ updateTimelineActivityTypeInput: input,
+ callerApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ },
+ );
+
+ return this.persistUpdate({
+ flatTimelineActivityTypeToUpdate,
+ workspaceId,
+ applicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ });
+ }
+
+ async reset({
+ id,
+ workspaceId,
+ }: {
+ id: string;
+ workspaceId: string;
+ }): Promise<TimelineActivityTypeDTO> {
+ const { workspaceCustomFlatApplication, flatTimelineActivityTypeMaps } =
+ await this.getWorkspaceUpdateContext(workspaceId);
+ const existingFlatTimelineActivityType = findFlatEntityByIdInFlatEntityMaps(
+ { flatEntityId: id, flatEntityMaps: flatTimelineActivityTypeMaps },
+ );
+
+ if (!isDefined(existingFlatTimelineActivityType)) {
+ throw new TimelineActivityTypeException(
+ 'Timeline activity type not found',
+ TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NOT_FOUND,
+ );
+ }
+
+ if (
+ existingFlatTimelineActivityType.applicationUniversalIdentifier ===
+ workspaceCustomFlatApplication.universalIdentifier
+ ) {
+ throw new TimelineActivityTypeException(
+ 'Custom timeline activity type cannot be reset to default',
+ TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_CANNOT_BE_RESET,
+ );
+ }
+
+ return this.persistUpdate({
+ flatTimelineActivityTypeToUpdate: {
+ ...existingFlatTimelineActivityType,
+ overrides: null,
+ isActive: true,
+ updatedAt: new Date().toISOString(),
+ },
+ workspaceId,
+ applicationUniversalIdentifier:
+ workspaceCustomFlatApplication.universalIdentifier,
+ });
+ }
+
+ private async getWorkspaceUpdateContext(workspaceId: string) {
+ const [applicationContext, metadataMaps] = await Promise.all([
+ this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ ),
+ this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+ { workspaceId, flatMapsKeys: ['flatTimelineActivityTypeMaps'] },
+ ),
+ ]);
+
+ return {
+ workspaceCustomFlatApplication:
+ applicationContext.workspaceCustomFlatApplication,
+ flatTimelineActivityTypeMaps: metadataMaps.flatTimelineActivityTypeMaps,
+ };
+ }
+
+ private async persistUpdate({
+ flatTimelineActivityTypeToUpdate,
+ workspaceId,
+ applicationUniversalIdentifier,
+ }: {
+ flatTimelineActivityTypeToUpdate: FlatTimelineActivityType;
+ workspaceId: string;
+ applicationUniversalIdentifier: string;
+ }): Promise<TimelineActivityTypeDTO> {
+ const validateAndBuildResult =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+ {
+ allFlatEntityOperationByMetadataName: {
+ timelineActivityType: {
+ flatEntityToCreate: [],
+ flatEntityToDelete: [],
+ flatEntityToUpdate: [flatTimelineActivityTypeToUpdate],
+ },
+ },
+ workspaceId,
+ isSystemBuild: false,
+ applicationUniversalIdentifier,
+ },
+ );
+
+ if (validateAndBuildResult.status === 'fail') {
+ throw new WorkspaceMigrationBuilderException(
+ validateAndBuildResult,
+ 'Multiple validation errors occurred while updating timeline activity type',
+ );
+ }
+
+ const { flatTimelineActivityTypeMaps } =
+ await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+ { workspaceId, flatMapsKeys: ['flatTimelineActivityTypeMaps'] },
+ );
+
+ return fromFlatTimelineActivityTypeToTimelineActivityTypeDto(
+ findFlatEntityByIdInFlatEntityMapsOrThrow({
+ flatEntityId: flatTimelineActivityTypeToUpdate.id,
+ flatEntityMaps: flatTimelineActivityTypeMaps,
+ }),
+ );
+ }
}
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.ts
new file mode 100644
index 00000000000..5aedeb41f18
--- /dev/null
+++ 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
@@ -0,0 +1,140 @@
+import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
+import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
+import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
+import { fromFlatTimelineActivityTypeToTimelineActivityTypeDto } from 'src/engine/metadata-modules/timeline-activity-type/utils/from-flat-timeline-activity-type-to-timeline-activity-type-dto.util';
+import { fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow } from 'src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util';
+
+const APPLICATION_UNIVERSAL_IDENTIFIER = '00000000-0000-4000-8000-000000000001';
+const WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000002';
+
+const timelineActivityType: FlatTimelineActivityType = {
+ id: '00000000-0000-4000-8000-000000000003',
+ universalIdentifier: '00000000-0000-4000-8000-000000000004',
+ workspaceId: '00000000-0000-4000-8000-000000000005',
+ applicationId: '00000000-0000-4000-8000-000000000006',
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ name: 'record.created',
+ label: 'was created by',
+ action: 'created',
+ icon: 'IconPlus',
+ frontComponentUniversalIdentifier: null,
+ objectUniversalIdentifier: null,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ isActive: true,
+ overrides: null,
+ createdAt: '2026-08-22T00:00:00.000Z',
+ updatedAt: '2026-08-22T00:00:00.000Z',
+};
+
+const flatTimelineActivityTypeMaps = addFlatEntityToFlatEntityMapsOrThrow({
+ flatEntity: timelineActivityType,
+ flatEntityMaps: createEmptyFlatEntityMaps(),
+});
+
+describe('fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow', () => {
+ it('stores presentation changes as workspace overrides and mutes the type', () => {
+ const result =
+ fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow(
+ {
+ flatTimelineActivityTypeMaps,
+ updateTimelineActivityTypeInput: {
+ id: timelineActivityType.id,
+ label: 'was added by',
+ icon: 'IconSparkles',
+ isActive: false,
+ },
+ callerApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ );
+
+ expect(result).toMatchObject({
+ label: 'was created by',
+ icon: 'IconPlus',
+ isActive: false,
+ overrides: { label: 'was added by', icon: 'IconSparkles' },
+ });
+ expect(
+ fromFlatTimelineActivityTypeToTimelineActivityTypeDto(result),
+ ).toMatchObject({
+ label: 'was added by',
+ icon: 'IconSparkles',
+ isActive: false,
+ emit: {
+ on: 'created',
+ objectUniversalIdentifier: null,
+ through: null,
+ },
+ });
+ });
+
+ it('updates presentation directly for a type owned by the caller', () => {
+ const result =
+ fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow(
+ {
+ flatTimelineActivityTypeMaps,
+ updateTimelineActivityTypeInput: {
+ id: timelineActivityType.id,
+ label: 'was added by',
+ },
+ callerApplicationUniversalIdentifier:
+ APPLICATION_UNIVERSAL_IDENTIFIER,
+ workspaceCustomApplicationUniversalIdentifier:
+ APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ );
+
+ expect(result).toMatchObject({
+ label: 'was added by',
+ overrides: null,
+ });
+ });
+
+ it('stores translated labels in the workspace override', () => {
+ const result =
+ fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow(
+ {
+ flatTimelineActivityTypeMaps,
+ updateTimelineActivityTypeInput: {
+ id: timelineActivityType.id,
+ translations: [
+ { locale: 'fr-FR', property: 'label', value: 'a été créé par' },
+ ],
+ },
+ callerApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ );
+
+ expect(result.overrides).toEqual({
+ translations: { 'fr-FR': { label: 'a été créé par' } },
+ });
+ });
+
+ it('rejects translations for non-translatable properties', () => {
+ expect(() =>
+ fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow(
+ {
+ flatTimelineActivityTypeMaps,
+ updateTimelineActivityTypeInput: {
+ id: timelineActivityType.id,
+ translations: [
+ { locale: 'fr-FR', property: 'icon', value: 'IconPlus' },
+ ],
+ },
+ callerApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ workspaceCustomApplicationUniversalIdentifier:
+ WORKSPACE_CUSTOM_APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ ),
+ ).toThrow('Cannot translate timeline activity type properties: icon');
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/is-valid-timeline-activity-type-override.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/is-valid-timeline-activity-type-override.util.spec.ts
new file mode 100644
index 00000000000..5b2325faad9
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/__tests__/is-valid-timeline-activity-type-override.util.spec.ts
@@ -0,0 +1,114 @@
+import { isValidTimelineActivityTypeOverride } from 'src/engine/metadata-modules/timeline-activity-type/utils/is-valid-timeline-activity-type-override.util';
+
+const CORE_APPLICATION = '00000000-0000-4000-8000-000000000001';
+const THIRD_PARTY_APPLICATION = '00000000-0000-4000-8000-000000000002';
+const COMPANY = '00000000-0000-4000-8000-000000000003';
+const CORE_RECORD_CREATED = '00000000-0000-4000-8000-000000000004';
+
+const coreRecordCreated = {
+ action: 'created',
+ applicationUniversalIdentifier: CORE_APPLICATION,
+ objectUniversalIdentifier: null,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+};
+
+const thirdPartyCompanyCreated = {
+ action: 'created',
+ applicationUniversalIdentifier: THIRD_PARTY_APPLICATION,
+ objectUniversalIdentifier: COMPANY,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ replacesTimelineActivityTypeUniversalIdentifier: CORE_RECORD_CREATED,
+};
+
+describe('isValidTimelineActivityTypeOverride', () => {
+ it('allows an application to bind timeline types to its own objects', () => {
+ expect(
+ isValidTimelineActivityTypeOverride({
+ timelineActivityType: {
+ ...thirdPartyCompanyCreated,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ },
+ objectOwner: {
+ applicationUniversalIdentifier: THIRD_PARTY_APPLICATION,
+ },
+ overriddenTimelineActivityType: undefined,
+ }),
+ ).toBe(true);
+ });
+
+ it('rejects an implicit takeover of another application object', () => {
+ expect(
+ isValidTimelineActivityTypeOverride({
+ timelineActivityType: {
+ ...thirdPartyCompanyCreated,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ },
+ objectOwner: { applicationUniversalIdentifier: CORE_APPLICATION },
+ overriddenTimelineActivityType: undefined,
+ }),
+ ).toBe(false);
+ });
+
+ it('allows explicit domain events on another application object', () => {
+ expect(
+ isValidTimelineActivityTypeOverride({
+ timelineActivityType: {
+ ...thirdPartyCompanyCreated,
+ action: null,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ },
+ objectOwner: { applicationUniversalIdentifier: CORE_APPLICATION },
+ overriddenTimelineActivityType: undefined,
+ }),
+ ).toBe(true);
+ });
+
+ it('allows an explicit compatible override', () => {
+ expect(
+ isValidTimelineActivityTypeOverride({
+ timelineActivityType: thirdPartyCompanyCreated,
+ objectOwner: { applicationUniversalIdentifier: CORE_APPLICATION },
+ overriddenTimelineActivityType: coreRecordCreated,
+ }),
+ ).toBe(true);
+ });
+
+ it('rejects an override that changes the event semantics', () => {
+ expect(
+ isValidTimelineActivityTypeOverride({
+ timelineActivityType: {
+ ...thirdPartyCompanyCreated,
+ action: 'deleted',
+ },
+ objectOwner: { applicationUniversalIdentifier: CORE_APPLICATION },
+ overriddenTimelineActivityType: coreRecordCreated,
+ }),
+ ).toBe(false);
+ });
+
+ it('rejects an override that changes the trigger fields', () => {
+ expect(
+ isValidTimelineActivityTypeOverride({
+ timelineActivityType: {
+ ...thirdPartyCompanyCreated,
+ triggerFieldUniversalIdentifiers: [COMPANY],
+ },
+ objectOwner: { applicationUniversalIdentifier: CORE_APPLICATION },
+ overriddenTimelineActivityType: coreRecordCreated,
+ }),
+ ).toBe(false);
+ });
+
+ it('revokes the override when its base type disappears', () => {
+ expect(
+ isValidTimelineActivityTypeOverride({
+ timelineActivityType: thirdPartyCompanyCreated,
+ objectOwner: { applicationUniversalIdentifier: CORE_APPLICATION },
+ overriddenTimelineActivityType: undefined,
+ }),
+ ).toBe(false);
+ });
+});
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.ts
index 2cefe5f9606..0065e9e3bd5 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
@@ -1,18 +1,45 @@
+import { isDefined } from 'twenty-shared/utils';
+
import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
import { type TimelineActivityTypeDTO } from 'src/engine/metadata-modules/timeline-activity-type/dtos/timeline-activity-type.dto';
+import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
export const fromFlatTimelineActivityTypeToTimelineActivityTypeDto = (
flatTimelineActivityType: FlatTimelineActivityType,
): TimelineActivityTypeDTO => ({
id: flatTimelineActivityType.id,
+ universalIdentifier: flatTimelineActivityType.universalIdentifier,
name: flatTimelineActivityType.name,
- label: flatTimelineActivityType.label,
+ label: resolveOverridableEntityProperty(flatTimelineActivityType, 'label'),
+ emit: isDefined(flatTimelineActivityType.action)
+ ? {
+ on: flatTimelineActivityType.action,
+ objectUniversalIdentifier:
+ flatTimelineActivityType.objectUniversalIdentifier,
+ through: isDefined(
+ flatTimelineActivityType.targetRelationFieldUniversalIdentifier,
+ )
+ ? {
+ relationFieldUniversalIdentifier:
+ flatTimelineActivityType.targetRelationFieldUniversalIdentifier,
+ triggerFieldUniversalIdentifiers:
+ flatTimelineActivityType.triggerFieldUniversalIdentifiers,
+ }
+ : null,
+ }
+ : null,
action: flatTimelineActivityType.action,
- icon: flatTimelineActivityType.icon,
- renderer: flatTimelineActivityType.renderer,
+ icon: resolveOverridableEntityProperty(flatTimelineActivityType, 'icon'),
+ renderer: null,
+ frontComponentUniversalIdentifier:
+ flatTimelineActivityType.frontComponentUniversalIdentifier,
objectUniversalIdentifier: flatTimelineActivityType.objectUniversalIdentifier,
+ replacesTimelineActivityTypeUniversalIdentifier:
+ flatTimelineActivityType.replacesTimelineActivityTypeUniversalIdentifier,
+ isActive: flatTimelineActivityType.isActive,
workspaceId: flatTimelineActivityType.workspaceId,
applicationId: flatTimelineActivityType.applicationId,
+ overrides: flatTimelineActivityType.overrides,
createdAt: new Date(flatTimelineActivityType.createdAt),
updatedAt: new Date(flatTimelineActivityType.updatedAt),
});
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.ts
new file mode 100644
index 00000000000..7ded3f9d2df
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/from-update-timeline-activity-type-input-to-flat-timeline-activity-type-to-update-or-throw.util.ts
@@ -0,0 +1,93 @@
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+
+import { type FlatTimelineActivityTypeMaps } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type-maps.type';
+import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { type UpdateTimelineActivityTypeInput } from 'src/engine/metadata-modules/timeline-activity-type/dtos/update-timeline-activity-type.input';
+import { type TimelineActivityTypeOverrides } from 'src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity';
+import { TimelineActivityTypeExceptionCode } from 'src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum';
+import { TimelineActivityTypeException } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.exception';
+import { findInvalidTranslationOverrideProperties } from 'src/engine/metadata-modules/utils/find-invalid-translation-override-properties.util';
+import { isCallerOverridingEntity } from 'src/engine/metadata-modules/utils/is-caller-overriding-entity.util';
+import { mergeTranslationsIntoOverrides } from 'src/engine/metadata-modules/utils/merge-translations-into-overrides.util';
+import { sanitizeOverridableEntityInput } from 'src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util';
+import { mergeUpdateInExistingRecord } from 'src/utils/merge-update-in-existing-record.util';
+
+const WORKSPACE_EDITABLE_TIMELINE_ACTIVITY_TYPE_PROPERTIES = [
+ 'label',
+ 'icon',
+ 'isActive',
+] as const;
+
+export const fromUpdateTimelineActivityTypeInputToFlatTimelineActivityTypeToUpdateOrThrow =
+ ({
+ flatTimelineActivityTypeMaps,
+ updateTimelineActivityTypeInput,
+ callerApplicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ }: {
+ flatTimelineActivityTypeMaps: FlatTimelineActivityTypeMaps;
+ updateTimelineActivityTypeInput: UpdateTimelineActivityTypeInput;
+ callerApplicationUniversalIdentifier: string;
+ workspaceCustomApplicationUniversalIdentifier: string;
+ }): FlatTimelineActivityType => {
+ const existingFlatTimelineActivityType = findFlatEntityByIdInFlatEntityMaps(
+ {
+ flatEntityId: updateTimelineActivityTypeInput.id,
+ flatEntityMaps: flatTimelineActivityTypeMaps,
+ },
+ );
+
+ if (!isDefined(existingFlatTimelineActivityType)) {
+ throw new TimelineActivityTypeException(
+ 'Timeline activity type not found',
+ TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NOT_FOUND,
+ );
+ }
+
+ const {
+ id: _id,
+ translations = [],
+ ...updates
+ } = updateTimelineActivityTypeInput;
+ const invalidTranslationProperties =
+ findInvalidTranslationOverrideProperties(
+ translations,
+ 'timelineActivityType',
+ );
+
+ if (isNonEmptyArray(invalidTranslationProperties)) {
+ throw new TimelineActivityTypeException(
+ `Cannot translate timeline activity type properties: ${invalidTranslationProperties.join(', ')}`,
+ TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ );
+ }
+
+ const shouldOverride = isCallerOverridingEntity({
+ callerApplicationUniversalIdentifier,
+ entityApplicationUniversalIdentifier:
+ existingFlatTimelineActivityType.applicationUniversalIdentifier,
+ workspaceCustomApplicationUniversalIdentifier,
+ isSystemSideEffect: false,
+ });
+ const { overrides, updatedEditableProperties } =
+ sanitizeOverridableEntityInput({
+ metadataName: 'timelineActivityType',
+ existingFlatEntity: existingFlatTimelineActivityType,
+ updatedEditableProperties: updates,
+ shouldOverride,
+ });
+
+ return {
+ ...mergeUpdateInExistingRecord({
+ existing: existingFlatTimelineActivityType,
+ properties: [...WORKSPACE_EDITABLE_TIMELINE_ACTIVITY_TYPE_PROPERTIES],
+ update: updatedEditableProperties,
+ }),
+ overrides: mergeTranslationsIntoOverrides<TimelineActivityTypeOverrides>({
+ existingOverrides: overrides,
+ translationEntries: translations,
+ }),
+ updatedAt: new Date().toISOString(),
+ };
+ };
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/is-valid-timeline-activity-type-override.util.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/is-valid-timeline-activity-type-override.util.ts
new file mode 100644
index 00000000000..ac86b27c9bb
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/is-valid-timeline-activity-type-override.util.ts
@@ -0,0 +1,128 @@
+import { isDefined } from 'twenty-shared/utils';
+
+type TimelineActivityTypeOverrideContract = {
+ action: string | null;
+ applicationUniversalIdentifier: string;
+ objectUniversalIdentifier: string | null;
+ targetRelationFieldUniversalIdentifier: string | null;
+ triggerFieldUniversalIdentifiers: string[] | null;
+ replacesTimelineActivityTypeUniversalIdentifier: string | null;
+};
+
+type ObjectOwner = {
+ applicationUniversalIdentifier: string;
+};
+
+const containSameValues = (
+ firstValues: string[] | null,
+ secondValues: string[] | null,
+): boolean => {
+ if (!isDefined(firstValues) || !isDefined(secondValues)) {
+ return firstValues === secondValues;
+ }
+
+ const firstValueSet = new Set(firstValues);
+ const secondValueSet = new Set(secondValues);
+
+ return (
+ firstValueSet.size === secondValueSet.size &&
+ [...firstValueSet].every((value) => secondValueSet.has(value))
+ );
+};
+
+export const isValidTimelineActivityTypeOverride = ({
+ timelineActivityType,
+ objectOwner,
+ overriddenTimelineActivityType,
+}: {
+ timelineActivityType: TimelineActivityTypeOverrideContract;
+ objectOwner: ObjectOwner | undefined;
+ overriddenTimelineActivityType:
+ | TimelineActivityTypeOverrideContract
+ | undefined;
+}): boolean => {
+ if (
+ isDefined(timelineActivityType.objectUniversalIdentifier) &&
+ !isDefined(objectOwner)
+ ) {
+ return false;
+ }
+
+ const targetsAnotherApplication =
+ isDefined(objectOwner) &&
+ objectOwner.applicationUniversalIdentifier !==
+ timelineActivityType.applicationUniversalIdentifier;
+ const overrideUniversalIdentifier =
+ timelineActivityType.replacesTimelineActivityTypeUniversalIdentifier;
+
+ if (!isDefined(timelineActivityType.action)) {
+ return !isDefined(overrideUniversalIdentifier);
+ }
+
+ if (!targetsAnotherApplication) {
+ return !isDefined(overrideUniversalIdentifier);
+ }
+
+ return (
+ isDefined(overrideUniversalIdentifier) &&
+ isDefined(overriddenTimelineActivityType) &&
+ overriddenTimelineActivityType.applicationUniversalIdentifier ===
+ objectOwner.applicationUniversalIdentifier &&
+ overriddenTimelineActivityType.action === timelineActivityType.action &&
+ (!isDefined(overriddenTimelineActivityType.objectUniversalIdentifier) ||
+ overriddenTimelineActivityType.objectUniversalIdentifier ===
+ timelineActivityType.objectUniversalIdentifier) &&
+ overriddenTimelineActivityType.targetRelationFieldUniversalIdentifier ===
+ timelineActivityType.targetRelationFieldUniversalIdentifier &&
+ containSameValues(
+ overriddenTimelineActivityType.triggerFieldUniversalIdentifiers,
+ timelineActivityType.triggerFieldUniversalIdentifiers,
+ )
+ );
+};
+
+export const partitionTimelineActivityTypesByValidity = <
+ TTimelineActivityType extends TimelineActivityTypeOverrideContract & {
+ universalIdentifier: string;
+ },
+>({
+ timelineActivityTypes,
+ objectMetadataByUniversalIdentifier,
+ timelineActivityTypeByUniversalIdentifier,
+}: {
+ timelineActivityTypes: TTimelineActivityType[];
+ objectMetadataByUniversalIdentifier: Partial<Record<string, ObjectOwner>>;
+ timelineActivityTypeByUniversalIdentifier: Partial<
+ Record<string, TTimelineActivityType>
+ >;
+}): {
+ validTimelineActivityTypes: TTimelineActivityType[];
+ invalidTimelineActivityTypes: TTimelineActivityType[];
+} => {
+ const validTimelineActivityTypes: TTimelineActivityType[] = [];
+ const invalidTimelineActivityTypes: TTimelineActivityType[] = [];
+
+ for (const timelineActivityType of timelineActivityTypes) {
+ const isValid = isValidTimelineActivityTypeOverride({
+ timelineActivityType,
+ objectOwner: isDefined(timelineActivityType.objectUniversalIdentifier)
+ ? objectMetadataByUniversalIdentifier[
+ timelineActivityType.objectUniversalIdentifier
+ ]
+ : undefined,
+ overriddenTimelineActivityType: isDefined(
+ timelineActivityType.replacesTimelineActivityTypeUniversalIdentifier,
+ )
+ ? timelineActivityTypeByUniversalIdentifier[
+ timelineActivityType.replacesTimelineActivityTypeUniversalIdentifier
+ ]
+ : undefined,
+ });
+
+ (isValid ? validTimelineActivityTypes : invalidTimelineActivityTypes).push(
+ timelineActivityType,
+ );
+ }
+
+ return { validTimelineActivityTypes, invalidTimelineActivityTypes };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/resolve-timeline-activity-type-override.util.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/resolve-timeline-activity-type-override.util.ts
new file mode 100644
index 00000000000..29940b5bf7e
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/resolve-timeline-activity-type-override.util.ts
@@ -0,0 +1,39 @@
+import { isDefined } from 'twenty-shared/utils';
+
+type TimelineActivityTypeOverride = {
+ universalIdentifier: string;
+ replacesTimelineActivityTypeUniversalIdentifier: string | null;
+};
+
+export const resolveTimelineActivityTypeOverride = <
+ TTimelineActivityType extends TimelineActivityTypeOverride,
+>(
+ timelineActivityTypes: TTimelineActivityType[],
+ allTimelineActivityTypeUniversalIdentifiers: ReadonlySet<string>,
+): TTimelineActivityType | undefined => {
+ const validCandidates = timelineActivityTypes.filter(
+ (timelineActivityType) =>
+ !isDefined(
+ timelineActivityType.replacesTimelineActivityTypeUniversalIdentifier,
+ ) ||
+ allTimelineActivityTypeUniversalIdentifiers.has(
+ timelineActivityType.replacesTimelineActivityTypeUniversalIdentifier,
+ ),
+ );
+ const overriddenUniversalIdentifiers = new Set(
+ validCandidates
+ .map(
+ (timelineActivityType) =>
+ timelineActivityType.replacesTimelineActivityTypeUniversalIdentifier,
+ )
+ .filter(isDefined),
+ );
+ const effectiveCandidates = validCandidates.filter(
+ (timelineActivityType) =>
+ !overriddenUniversalIdentifiers.has(
+ timelineActivityType.universalIdentifier,
+ ),
+ );
+
+ return effectiveCandidates.length === 1 ? effectiveCandidates[0] : undefined;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/timeline-activity-type-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/timeline-activity-type-graphql-api-exception-handler.util.ts
new file mode 100644
index 00000000000..ce12d7a9265
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/timeline-activity-type/utils/timeline-activity-type-graphql-api-exception-handler.util.ts
@@ -0,0 +1,27 @@
+import { assertUnreachable } from 'twenty-shared/utils';
+
+import {
+ NotFoundError,
+ UserInputError,
+} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+import { TimelineActivityTypeExceptionCode } from 'src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum';
+import { TimelineActivityTypeException } from 'src/engine/metadata-modules/timeline-activity-type/timeline-activity-type.exception';
+
+export const timelineActivityTypeGraphqlApiExceptionHandler = (
+ error: Error,
+) => {
+ if (error instanceof TimelineActivityTypeException) {
+ switch (error.code) {
+ case TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NOT_FOUND:
+ throw new NotFoundError(error);
+ case TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_CANNOT_BE_RESET:
+ case TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NAME_ALREADY_EXISTS:
+ case TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT:
+ throw new UserInputError(error);
+ default:
+ return assertUnreachable(error.code);
+ }
+ }
+
+ throw error;
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util.ts b/packages/twenty-server/src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util.ts
index 687bff9680c..2a5f080d57c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/utils/sanitize-overridable-entity-input.util.ts
@@ -3,14 +3,15 @@ import { type AllMetadataName } from 'twenty-shared/metadata';
import { ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-overridable-properties-by-metadata-name.constant';
import { computeMetadataOverridesBlob } from 'src/engine/metadata-modules/utils/compute-metadata-overrides-blob.util';
-type FlatEntityWithOverrides = {
+type FlatEntityWithOverrides<TOverrides> = {
[key: string]: unknown;
- overrides: Record<string, unknown> | null;
+ overrides: TOverrides | null;
};
export const sanitizeOverridableEntityInput = <
T extends AllMetadataName,
TProperties extends Record<string, unknown>,
+ TOverrides = Record<string, unknown>,
>({
metadataName,
existingFlatEntity,
@@ -18,11 +19,11 @@ export const sanitizeOverridableEntityInput = <
shouldOverride,
}: {
metadataName: T;
- existingFlatEntity: FlatEntityWithOverrides;
+ existingFlatEntity: FlatEntityWithOverrides<TOverrides>;
updatedEditableProperties: TProperties;
shouldOverride: boolean;
}): {
- overrides: Record<string, unknown> | null;
+ overrides: TOverrides | null;
updatedEditableProperties: TProperties;
} => {
if (!shouldOverride) {
@@ -32,7 +33,10 @@ export const sanitizeOverridableEntityInput = <
};
}
- const { overrides, remainingProperties } = computeMetadataOverridesBlob({
+ const { overrides, remainingProperties } = computeMetadataOverridesBlob<
+ TProperties,
+ TOverrides
+ >({
overridableProperties: ALL_OVERRIDABLE_PROPERTIES_BY_METADATA_NAME[
metadataName
] as string[],
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts
index e46b53bdb0c..99117510358 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/timeline-activity-seeder.service.ts
@@ -3,11 +3,15 @@ import { Injectable } from '@nestjs/common';
import chunk from 'lodash.chunk';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { ObjectRecord } from 'twenty-shared/types';
-import { capitalize } from 'twenty-shared/utils';
+import { capitalize, isDefined } from 'twenty-shared/utils';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';
-import { type TimelineActivityTypeResolver } from 'src/modules/timeline/utils/resolve-timeline-activity-type-id.util';
+import {
+ type ResolveTimelineActivityTypeArgs,
+ type ResolvedTimelineActivityType,
+} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
+import { TimelineException } from 'src/modules/timeline/exceptions/timeline.exception';
import { type WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';
import { CALENDAR_EVENT_DATA_SEEDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/calendar-event-data-seeds.constant';
import {
@@ -35,6 +39,10 @@ import { buildTimelineActivityRelatedMorphFieldMetadataName } from 'src/modules/
type RecordSeedWithId = Pick<ObjectRecord, 'id'> & Record<string, unknown>;
+type RequiredTimelineActivityTypeResolver = (
+ args: ResolveTimelineActivityTypeArgs,
+) => ResolvedTimelineActivityType;
+
type TimelineActivitySeedData = Pick<
TimelineActivityWorkspaceEntity,
| 'id'
@@ -49,6 +57,7 @@ type TimelineActivitySeedData = Pick<
| 'targetCompanyId'
| 'targetOpportunityId'
> & {
+ timelineActivityTypeSnapshot: string; // JSON stringified for raw insertion
properties: string; // JSON stringified for raw insertion
createdAt: string; // ISO string for raw insertion
updatedAt: string; // ISO string for raw insertion
@@ -64,7 +73,7 @@ type CreateTimelineActivityParams = {
entityType: string;
recordSeed: RecordSeedWithId;
index: number;
- resolveTimelineActivityTypeId: TimelineActivityTypeResolver;
+ resolveTimelineActivityTypeId: RequiredTimelineActivityTypeResolver;
};
type CreateLinkedActivityParams = {
@@ -74,7 +83,7 @@ type CreateLinkedActivityParams = {
activityIndex: number;
linkedObjectMetadataId: string;
targetInfo: ActivityTargetInfo;
- resolveTimelineActivityTypeId: TimelineActivityTypeResolver;
+ resolveTimelineActivityTypeId: RequiredTimelineActivityTypeResolver;
};
type EntityConfig = {
@@ -133,10 +142,23 @@ export class TimelineActivitySeederService {
const messageParticipants = getMessageParticipantDataSeeds(workspaceId);
const timelineActivities: TimelineActivitySeedData[] = [];
const metadataIds = await this.getObjectMetadataIds(workspaceId);
- const resolveTimelineActivityTypeId =
+ const resolveTimelineActivityType =
await this.timelineActivityTypeCacheService.getTimelineActivityTypeResolver(
workspaceId,
);
+ const resolveRequiredTimelineActivityType = (
+ args: ResolveTimelineActivityTypeArgs,
+ ) => {
+ const timelineActivityType = resolveTimelineActivityType(args);
+
+ if (!isDefined(timelineActivityType)) {
+ throw new TimelineException(
+ `Timeline activity type ${args.action} is required to seed workspace ${workspaceId}`,
+ );
+ }
+
+ return timelineActivityType;
+ };
let activityIndex = 0;
const entityConfigs: EntityConfig[] = [
@@ -158,7 +180,7 @@ export class TimelineActivitySeederService {
entityType: type,
recordSeed: seed,
index,
- resolveTimelineActivityTypeId,
+ resolveTimelineActivityTypeId: resolveRequiredTimelineActivityType,
});
timelineActivities.push(activity);
@@ -180,7 +202,7 @@ export class TimelineActivitySeederService {
linkedObjectMetadataId,
calendarEventParticipants,
messageParticipants,
- resolveTimelineActivityTypeId,
+ resolveTimelineActivityTypeId: resolveRequiredTimelineActivityType,
});
timelineActivities.push(...linkedActivities);
@@ -202,7 +224,7 @@ export class TimelineActivitySeederService {
linkedObjectMetadataId,
calendarEventParticipants,
messageParticipants,
- resolveTimelineActivityTypeId,
+ resolveTimelineActivityTypeId: resolveRequiredTimelineActivityType,
});
timelineActivities.push(...linkedActivities);
@@ -252,6 +274,7 @@ export class TimelineActivitySeederService {
.into(`${schemaName}.timelineActivity`, [
'id',
'timelineActivityTypeId',
+ 'timelineActivityTypeSnapshot',
'properties',
'linkedRecordCachedName',
'linkedRecordId',
@@ -285,10 +308,15 @@ export class TimelineActivitySeederService {
const creationDate = new Date().toISOString();
const recordId = recordSeed.id;
+ const timelineActivityType = resolveTimelineActivityTypeId({
+ action: 'created',
+ });
const timelineActivity: TimelineActivitySeedData = {
id: timelineActivityId,
- timelineActivityTypeId:
- resolveTimelineActivityTypeId({ action: 'created' }) ?? null,
+ timelineActivityTypeId: timelineActivityType.id,
+ timelineActivityTypeSnapshot: JSON.stringify(
+ timelineActivityType.snapshot,
+ ),
properties: JSON.stringify({
after: this.getEventAfterRecordProperties(entityType, recordSeed),
}),
@@ -412,7 +440,7 @@ export class TimelineActivitySeederService {
linkedObjectMetadataId: string;
calendarEventParticipants: CalendarEventParticipantDataSeed[];
messageParticipants: MessageParticipantDataSeed[];
- resolveTimelineActivityTypeId: TimelineActivityTypeResolver;
+ resolveTimelineActivityTypeId: RequiredTimelineActivityTypeResolver;
}): TimelineActivitySeedData[] {
const targetInfos = this.getActivityTargetInfos(
activityType,
@@ -586,14 +614,17 @@ export class TimelineActivitySeederService {
const { linkedRecordCachedName, linkedProperties } =
this.getLinkedRecordData(activityType, recordSeed, index);
+ const timelineActivityType = resolveTimelineActivityTypeId({
+ action: 'linked',
+ objectUniversalIdentifier:
+ STANDARD_OBJECTS[activityType].universalIdentifier,
+ });
const linkedActivity: TimelineActivitySeedData = {
id: linkedActivityId,
- timelineActivityTypeId:
- resolveTimelineActivityTypeId({
- action: 'linked',
- objectUniversalIdentifier:
- STANDARD_OBJECTS[activityType].universalIdentifier,
- }) ?? null,
+ timelineActivityTypeId: timelineActivityType.id,
+ timelineActivityTypeSnapshot: JSON.stringify(
+ timelineActivityType.snapshot,
+ ),
properties: JSON.stringify({ after: linkedProperties }),
linkedRecordCachedName,
linkedRecordId: recordSeed.id,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
index 7fb39fb91e1..423ba45be89 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
@@ -2424,19 +2424,19 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"id": "00000000-0000-0000-0000-000000000722",
},
"happensAt": {
- "id": "00000000-0000-0000-0000-000000000729",
+ "id": "00000000-0000-0000-0000-000000000730",
},
"id": {
"id": "00000000-0000-0000-0000-000000000719",
},
"linkedObjectMetadataId": {
- "id": "00000000-0000-0000-0000-000000000745",
+ "id": "00000000-0000-0000-0000-000000000746",
},
"linkedRecordCachedName": {
- "id": "00000000-0000-0000-0000-000000000743",
+ "id": "00000000-0000-0000-0000-000000000744",
},
"linkedRecordId": {
- "id": "00000000-0000-0000-0000-000000000744",
+ "id": "00000000-0000-0000-0000-000000000745",
},
"name": {
"id": "00000000-0000-0000-0000-000000000727",
@@ -2445,47 +2445,50 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"id": "00000000-0000-0000-0000-000000000725",
},
"properties": {
- "id": "00000000-0000-0000-0000-000000000730",
+ "id": "00000000-0000-0000-0000-000000000731",
},
"searchVector": {
"id": "00000000-0000-0000-0000-000000000726",
},
"targetCompany": {
- "id": "00000000-0000-0000-0000-000000000733",
+ "id": "00000000-0000-0000-0000-000000000734",
},
"targetDashboard": {
- "id": "00000000-0000-0000-0000-000000000740",
+ "id": "00000000-0000-0000-0000-000000000741",
},
"targetMessageCampaign": {
- "id": "00000000-0000-0000-0000-000000000742",
+ "id": "00000000-0000-0000-0000-000000000743",
},
"targetMessageList": {
- "id": "00000000-0000-0000-0000-000000000741",
+ "id": "00000000-0000-0000-0000-000000000742",
},
"targetNote": {
- "id": "00000000-0000-0000-0000-000000000736",
+ "id": "00000000-0000-0000-0000-000000000737",
},
"targetOpportunity": {
- "id": "00000000-0000-0000-0000-000000000734",
+ "id": "00000000-0000-0000-0000-000000000735",
},
"targetPerson": {
- "id": "00000000-0000-0000-0000-000000000732",
+ "id": "00000000-0000-0000-0000-000000000733",
},
"targetTask": {
- "id": "00000000-0000-0000-0000-000000000735",
+ "id": "00000000-0000-0000-0000-000000000736",
},
"targetWorkflow": {
- "id": "00000000-0000-0000-0000-000000000737",
+ "id": "00000000-0000-0000-0000-000000000738",
},
"targetWorkflowRun": {
- "id": "00000000-0000-0000-0000-000000000739",
+ "id": "00000000-0000-0000-0000-000000000740",
},
"targetWorkflowVersion": {
- "id": "00000000-0000-0000-0000-000000000738",
+ "id": "00000000-0000-0000-0000-000000000739",
},
"timelineActivityTypeId": {
"id": "00000000-0000-0000-0000-000000000728",
},
+ "timelineActivityTypeSnapshot": {
+ "id": "00000000-0000-0000-0000-000000000729",
+ },
"updatedAt": {
"id": "00000000-0000-0000-0000-000000000721",
},
@@ -2493,50 +2496,50 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"id": "00000000-0000-0000-0000-000000000724",
},
"workspaceMember": {
- "id": "00000000-0000-0000-0000-000000000731",
+ "id": "00000000-0000-0000-0000-000000000732",
},
},
- "id": "00000000-0000-0000-0000-000000000759",
+ "id": "00000000-0000-0000-0000-000000000760",
"views": {
"allTimelineActivities": {
- "id": "00000000-0000-0000-0000-000000000758",
+ "id": "00000000-0000-0000-0000-000000000759",
"viewFieldGroups": {},
"viewFields": {
"happensAt": {
- "id": "00000000-0000-0000-0000-000000000747",
+ "id": "00000000-0000-0000-0000-000000000748",
},
"linkedRecordCachedName": {
- "id": "00000000-0000-0000-0000-000000000746",
+ "id": "00000000-0000-0000-0000-000000000747",
},
"targetCompany": {
- "id": "00000000-0000-0000-0000-000000000750",
+ "id": "00000000-0000-0000-0000-000000000751",
},
"targetDashboard": {
- "id": "00000000-0000-0000-0000-000000000757",
+ "id": "00000000-0000-0000-0000-000000000758",
},
"targetNote": {
- "id": "00000000-0000-0000-0000-000000000753",
+ "id": "00000000-0000-0000-0000-000000000754",
},
"targetOpportunity": {
- "id": "00000000-0000-0000-0000-000000000751",
+ "id": "00000000-0000-0000-0000-000000000752",
},
"targetPerson": {
- "id": "00000000-0000-0000-0000-000000000749",
+ "id": "00000000-0000-0000-0000-000000000750",
},
"targetTask": {
- "id": "00000000-0000-0000-0000-000000000752",
+ "id": "00000000-0000-0000-0000-000000000753",
},
"targetWorkflow": {
- "id": "00000000-0000-0000-0000-000000000754",
+ "id": "00000000-0000-0000-0000-000000000755",
},
"targetWorkflowRun": {
- "id": "00000000-0000-0000-0000-000000000756",
+ "id": "00000000-0000-0000-0000-000000000757",
},
"targetWorkflowVersion": {
- "id": "00000000-0000-0000-0000-000000000755",
+ "id": "00000000-0000-0000-0000-000000000756",
},
"workspaceMember": {
- "id": "00000000-0000-0000-0000-000000000748",
+ "id": "00000000-0000-0000-0000-000000000749",
},
},
"viewGroups": {},
@@ -2546,80 +2549,80 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"workflow": {
"fields": {
"attachments": {
- "id": "00000000-0000-0000-0000-000000000776",
+ "id": "00000000-0000-0000-0000-000000000777",
},
"automatedTriggers": {
- "id": "00000000-0000-0000-0000-000000000774",
+ "id": "00000000-0000-0000-0000-000000000775",
},
"coreWorkflowId": {
- "id": "00000000-0000-0000-0000-000000000770",
+ "id": "00000000-0000-0000-0000-000000000771",
},
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000761",
+ "id": "00000000-0000-0000-0000-000000000762",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000764",
+ "id": "00000000-0000-0000-0000-000000000765",
},
"deletedAt": {
- "id": "00000000-0000-0000-0000-000000000763",
+ "id": "00000000-0000-0000-0000-000000000764",
},
"id": {
- "id": "00000000-0000-0000-0000-000000000760",
+ "id": "00000000-0000-0000-0000-000000000761",
},
"lastPublishedVersionId": {
- "id": "00000000-0000-0000-0000-000000000769",
+ "id": "00000000-0000-0000-0000-000000000770",
},
"name": {
- "id": "00000000-0000-0000-0000-000000000768",
+ "id": "00000000-0000-0000-0000-000000000769",
},
"position": {
- "id": "00000000-0000-0000-0000-000000000766",
+ "id": "00000000-0000-0000-0000-000000000767",
},
"runs": {
- "id": "00000000-0000-0000-0000-000000000773",
+ "id": "00000000-0000-0000-0000-000000000774",
},
"searchVector": {
- "id": "00000000-0000-0000-0000-000000000767",
+ "id": "00000000-0000-0000-0000-000000000768",
},
"statuses": {
- "id": "00000000-0000-0000-0000-000000000771",
+ "id": "00000000-0000-0000-0000-000000000772",
},
"timelineActivities": {
- "id": "00000000-0000-0000-0000-000000000775",
+ "id": "00000000-0000-0000-0000-000000000776",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000762",
+ "id": "00000000-0000-0000-0000-000000000763",
},
"updatedBy": {
- "id": "00000000-0000-0000-0000-000000000765",
+ "id": "00000000-0000-0000-0000-000000000766",
},
"versions": {
- "id": "00000000-0000-0000-0000-000000000772",
+ "id": "00000000-0000-0000-0000-000000000773",
},
},
- "id": "00000000-0000-0000-0000-000000000784",
+ "id": "00000000-0000-0000-0000-000000000785",
"views": {
"allWorkflows": {
- "id": "00000000-0000-0000-0000-000000000783",
+ "id": "00000000-0000-0000-0000-000000000784",
"viewFieldGroups": {},
"viewFields": {
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000780",
+ "id": "00000000-0000-0000-0000-000000000781",
},
"name": {
- "id": "00000000-0000-0000-0000-000000000777",
+ "id": "00000000-0000-0000-0000-000000000778",
},
"runs": {
- "id": "00000000-0000-0000-0000-000000000782",
+ "id": "00000000-0000-0000-0000-000000000783",
},
"statuses": {
- "id": "00000000-0000-0000-0000-000000000778",
+ "id": "00000000-0000-0000-0000-000000000779",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000779",
+ "id": "00000000-0000-0000-0000-000000000780",
},
"versions": {
- "id": "00000000-0000-0000-0000-000000000781",
+ "id": "00000000-0000-0000-0000-000000000782",
},
},
"viewGroups": {},
@@ -2629,79 +2632,79 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"workflowAutomatedTrigger": {
"fields": {
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000786",
+ "id": "00000000-0000-0000-0000-000000000787",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000789",
+ "id": "00000000-0000-0000-0000-000000000790",
},
"deletedAt": {
- "id": "00000000-0000-0000-0000-000000000788",
+ "id": "00000000-0000-0000-0000-000000000789",
},
"id": {
- "id": "00000000-0000-0000-0000-000000000785",
+ "id": "00000000-0000-0000-0000-000000000786",
},
"position": {
- "id": "00000000-0000-0000-0000-000000000791",
+ "id": "00000000-0000-0000-0000-000000000792",
},
"searchVector": {
- "id": "00000000-0000-0000-0000-000000000792",
+ "id": "00000000-0000-0000-0000-000000000793",
},
"settings": {
- "id": "00000000-0000-0000-0000-000000000794",
+ "id": "00000000-0000-0000-0000-000000000795",
},
"type": {
- "id": "00000000-0000-0000-0000-000000000793",
+ "id": "00000000-0000-0000-0000-000000000794",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000787",
+ "id": "00000000-0000-0000-0000-000000000788",
},
"updatedBy": {
- "id": "00000000-0000-0000-0000-000000000790",
+ "id": "00000000-0000-0000-0000-000000000791",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000795",
+ "id": "00000000-0000-0000-0000-000000000796",
},
},
- "id": "00000000-0000-0000-0000-000000000807",
+ "id": "00000000-0000-0000-0000-000000000808",
"views": {
"allWorkflowAutomatedTriggers": {
- "id": "00000000-0000-0000-0000-000000000799",
+ "id": "00000000-0000-0000-0000-000000000800",
"viewFieldGroups": {},
"viewFields": {
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000798",
+ "id": "00000000-0000-0000-0000-000000000799",
},
"type": {
- "id": "00000000-0000-0000-0000-000000000796",
+ "id": "00000000-0000-0000-0000-000000000797",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000797",
+ "id": "00000000-0000-0000-0000-000000000798",
},
},
"viewGroups": {},
},
"workflowAutomatedTriggerRecordPageFields": {
- "id": "00000000-0000-0000-0000-000000000806",
+ "id": "00000000-0000-0000-0000-000000000807",
"viewFieldGroups": {
"general": {
- "id": "00000000-0000-0000-0000-000000000804",
+ "id": "00000000-0000-0000-0000-000000000805",
},
"system": {
- "id": "00000000-0000-0000-0000-000000000805",
+ "id": "00000000-0000-0000-0000-000000000806",
},
},
"viewFields": {
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000802",
+ "id": "00000000-0000-0000-0000-000000000803",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000803",
+ "id": "00000000-0000-0000-0000-000000000804",
},
"type": {
- "id": "00000000-0000-0000-0000-000000000800",
+ "id": "00000000-0000-0000-0000-000000000801",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000801",
+ "id": "00000000-0000-0000-0000-000000000802",
},
},
"viewGroups": {},
@@ -2711,124 +2714,124 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"workflowRun": {
"fields": {
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000809",
+ "id": "00000000-0000-0000-0000-000000000810",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000812",
+ "id": "00000000-0000-0000-0000-000000000813",
},
"deletedAt": {
- "id": "00000000-0000-0000-0000-000000000811",
+ "id": "00000000-0000-0000-0000-000000000812",
},
"endedAt": {
- "id": "00000000-0000-0000-0000-000000000821",
+ "id": "00000000-0000-0000-0000-000000000822",
},
"enqueuedAt": {
- "id": "00000000-0000-0000-0000-000000000819",
+ "id": "00000000-0000-0000-0000-000000000820",
},
"id": {
- "id": "00000000-0000-0000-0000-000000000808",
+ "id": "00000000-0000-0000-0000-000000000809",
},
"name": {
- "id": "00000000-0000-0000-0000-000000000816",
+ "id": "00000000-0000-0000-0000-000000000817",
},
"position": {
- "id": "00000000-0000-0000-0000-000000000814",
+ "id": "00000000-0000-0000-0000-000000000815",
},
"searchVector": {
- "id": "00000000-0000-0000-0000-000000000815",
+ "id": "00000000-0000-0000-0000-000000000816",
},
"startedAt": {
- "id": "00000000-0000-0000-0000-000000000820",
+ "id": "00000000-0000-0000-0000-000000000821",
},
"state": {
- "id": "00000000-0000-0000-0000-000000000823",
+ "id": "00000000-0000-0000-0000-000000000824",
},
"status": {
- "id": "00000000-0000-0000-0000-000000000822",
+ "id": "00000000-0000-0000-0000-000000000823",
},
"stepLogs": {
- "id": "00000000-0000-0000-0000-000000000824",
+ "id": "00000000-0000-0000-0000-000000000825",
},
"timelineActivities": {
- "id": "00000000-0000-0000-0000-000000000825",
+ "id": "00000000-0000-0000-0000-000000000826",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000810",
+ "id": "00000000-0000-0000-0000-000000000811",
},
"updatedBy": {
- "id": "00000000-0000-0000-0000-000000000813",
+ "id": "00000000-0000-0000-0000-000000000814",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000818",
+ "id": "00000000-0000-0000-0000-000000000819",
},
"workflowVersion": {
- "id": "00000000-0000-0000-0000-000000000817",
+ "id": "00000000-0000-0000-0000-000000000818",
},
},
- "id": "00000000-0000-0000-0000-000000000845",
+ "id": "00000000-0000-0000-0000-000000000846",
"views": {
"allWorkflowRuns": {
- "id": "00000000-0000-0000-0000-000000000829",
+ "id": "00000000-0000-0000-0000-000000000830",
"viewFieldGroups": {},
"viewFields": {
"name": {
- "id": "00000000-0000-0000-0000-000000000826",
+ "id": "00000000-0000-0000-0000-000000000827",
},
"status": {
- "id": "00000000-0000-0000-0000-000000000828",
+ "id": "00000000-0000-0000-0000-000000000829",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000827",
+ "id": "00000000-0000-0000-0000-000000000828",
},
},
"viewGroups": {},
},
"workflowRunRecordPageFields": {
- "id": "00000000-0000-0000-0000-000000000844",
+ "id": "00000000-0000-0000-0000-000000000845",
"viewFieldGroups": {
"general": {
- "id": "00000000-0000-0000-0000-000000000842",
+ "id": "00000000-0000-0000-0000-000000000843",
},
"system": {
- "id": "00000000-0000-0000-0000-000000000843",
+ "id": "00000000-0000-0000-0000-000000000844",
},
},
"viewFields": {
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000835",
+ "id": "00000000-0000-0000-0000-000000000836",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000836",
+ "id": "00000000-0000-0000-0000-000000000837",
},
"endedAt": {
- "id": "00000000-0000-0000-0000-000000000834",
+ "id": "00000000-0000-0000-0000-000000000835",
},
"enqueuedAt": {
- "id": "00000000-0000-0000-0000-000000000837",
+ "id": "00000000-0000-0000-0000-000000000838",
},
"startedAt": {
- "id": "00000000-0000-0000-0000-000000000833",
+ "id": "00000000-0000-0000-0000-000000000834",
},
"state": {
- "id": "00000000-0000-0000-0000-000000000838",
+ "id": "00000000-0000-0000-0000-000000000839",
},
"status": {
- "id": "00000000-0000-0000-0000-000000000830",
+ "id": "00000000-0000-0000-0000-000000000831",
},
"timelineActivities": {
- "id": "00000000-0000-0000-0000-000000000841",
+ "id": "00000000-0000-0000-0000-000000000842",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000839",
+ "id": "00000000-0000-0000-0000-000000000840",
},
"updatedBy": {
- "id": "00000000-0000-0000-0000-000000000840",
+ "id": "00000000-0000-0000-0000-000000000841",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000831",
+ "id": "00000000-0000-0000-0000-000000000832",
},
"workflowVersion": {
- "id": "00000000-0000-0000-0000-000000000832",
+ "id": "00000000-0000-0000-0000-000000000833",
},
},
"viewGroups": {},
@@ -2838,118 +2841,118 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"workflowVersion": {
"fields": {
"coreWorkflowVersionId": {
- "id": "00000000-0000-0000-0000-000000000860",
+ "id": "00000000-0000-0000-0000-000000000861",
},
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000847",
+ "id": "00000000-0000-0000-0000-000000000848",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000850",
+ "id": "00000000-0000-0000-0000-000000000851",
},
"deletedAt": {
- "id": "00000000-0000-0000-0000-000000000849",
+ "id": "00000000-0000-0000-0000-000000000850",
},
"id": {
- "id": "00000000-0000-0000-0000-000000000846",
+ "id": "00000000-0000-0000-0000-000000000847",
},
"name": {
- "id": "00000000-0000-0000-0000-000000000854",
+ "id": "00000000-0000-0000-0000-000000000855",
},
"position": {
- "id": "00000000-0000-0000-0000-000000000852",
+ "id": "00000000-0000-0000-0000-000000000853",
},
"runs": {
- "id": "00000000-0000-0000-0000-000000000858",
+ "id": "00000000-0000-0000-0000-000000000859",
},
"searchVector": {
- "id": "00000000-0000-0000-0000-000000000853",
+ "id": "00000000-0000-0000-0000-000000000854",
},
"status": {
- "id": "00000000-0000-0000-0000-000000000857",
+ "id": "00000000-0000-0000-0000-000000000858",
},
"steps": {
- "id": "00000000-0000-0000-0000-000000000859",
+ "id": "00000000-0000-0000-0000-000000000860",
},
"timelineActivities": {
- "id": "00000000-0000-0000-0000-000000000861",
+ "id": "00000000-0000-0000-0000-000000000862",
},
"trigger": {
- "id": "00000000-0000-0000-0000-000000000856",
+ "id": "00000000-0000-0000-0000-000000000857",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000848",
+ "id": "00000000-0000-0000-0000-000000000849",
},
"updatedBy": {
- "id": "00000000-0000-0000-0000-000000000851",
+ "id": "00000000-0000-0000-0000-000000000852",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000855",
+ "id": "00000000-0000-0000-0000-000000000856",
},
},
- "id": "00000000-0000-0000-0000-000000000881",
+ "id": "00000000-0000-0000-0000-000000000882",
"views": {
"allWorkflowVersions": {
- "id": "00000000-0000-0000-0000-000000000867",
+ "id": "00000000-0000-0000-0000-000000000868",
"viewFieldGroups": {},
"viewFields": {
"name": {
- "id": "00000000-0000-0000-0000-000000000862",
+ "id": "00000000-0000-0000-0000-000000000863",
},
"runs": {
- "id": "00000000-0000-0000-0000-000000000866",
+ "id": "00000000-0000-0000-0000-000000000867",
},
"status": {
- "id": "00000000-0000-0000-0000-000000000864",
+ "id": "00000000-0000-0000-0000-000000000865",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000865",
+ "id": "00000000-0000-0000-0000-000000000866",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000863",
+ "id": "00000000-0000-0000-0000-000000000864",
},
},
"viewGroups": {},
},
"workflowVersionRecordPageFields": {
- "id": "00000000-0000-0000-0000-000000000880",
+ "id": "00000000-0000-0000-0000-000000000881",
"viewFieldGroups": {
"general": {
- "id": "00000000-0000-0000-0000-000000000878",
+ "id": "00000000-0000-0000-0000-000000000879",
},
"system": {
- "id": "00000000-0000-0000-0000-000000000879",
+ "id": "00000000-0000-0000-0000-000000000880",
},
},
"viewFields": {
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000871",
+ "id": "00000000-0000-0000-0000-000000000872",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000873",
+ "id": "00000000-0000-0000-0000-000000000874",
},
"runs": {
- "id": "00000000-0000-0000-0000-000000000876",
+ "id": "00000000-0000-0000-0000-000000000877",
},
"status": {
- "id": "00000000-0000-0000-0000-000000000868",
+ "id": "00000000-0000-0000-0000-000000000869",
},
"steps": {
- "id": "00000000-0000-0000-0000-000000000872",
+ "id": "00000000-0000-0000-0000-000000000873",
},
"timelineActivities": {
- "id": "00000000-0000-0000-0000-000000000877",
+ "id": "00000000-0000-0000-0000-000000000878",
},
"trigger": {
- "id": "00000000-0000-0000-0000-000000000870",
+ "id": "00000000-0000-0000-0000-000000000871",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000874",
+ "id": "00000000-0000-0000-0000-000000000875",
},
"updatedBy": {
- "id": "00000000-0000-0000-0000-000000000875",
+ "id": "00000000-0000-0000-0000-000000000876",
},
"workflow": {
- "id": "00000000-0000-0000-0000-000000000869",
+ "id": "00000000-0000-0000-0000-000000000870",
},
},
"viewGroups": {},
@@ -2959,110 +2962,110 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
"workspaceMember": {
"fields": {
"accountOwnerForCompanies": {
- "id": "00000000-0000-0000-0000-000000000901",
+ "id": "00000000-0000-0000-0000-000000000902",
},
"assignedTasks": {
- "id": "00000000-0000-0000-0000-000000000899",
+ "id": "00000000-0000-0000-0000-000000000900",
},
"avatarUrl": {
- "id": "00000000-0000-0000-0000-000000000895",
+ "id": "00000000-0000-0000-0000-000000000896",
},
"blocklist": {
- "id": "00000000-0000-0000-0000-000000000903",
+ "id": "00000000-0000-0000-0000-000000000904",
},
"calendarEventParticipants": {
- "id": "00000000-0000-0000-0000-000000000904",
+ "id": "00000000-0000-0000-0000-000000000905",
},
"calendarStartDay": {
- "id": "00000000-0000-0000-0000-000000000909",
+ "id": "00000000-0000-0000-0000-000000000910",
},
"colorScheme": {
- "id": "00000000-0000-0000-0000-000000000891",
+ "id": "00000000-0000-0000-0000-000000000892",
},
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000883",
+ "id": "00000000-0000-0000-0000-000000000884",
},
"createdBy": {
- "id": "00000000-0000-0000-0000-000000000886",
+ "id": "00000000-0000-0000-0000-000000000887",
},
"dateFormat": {
- "id": "00000000-0000-0000-0000-000000000907",
+ "id": "00000000-0000-0000-0000-000000000908",
},
"deletedAt": {
- "id": "00000000-0000-0000-0000-000000000885",
+ "id": "00000000-0000-0000-0000-000000000886",
},
"id": {
- "id": "00000000-0000-0000-0000-000000000882",
+ "id": "00000000-0000-0000-0000-000000000883",
},
"jobTitle": {
- "id": "00000000-0000-0000-0000-000000000897",
+ "id": "00000000-0000-0000-0000-000000000898",
},
"locale": {
- "id": "00000000-0000-0000-0000-000000000894",
+ "id": "00000000-0000-0000-0000-000000000895",
},
"messageParticipants": {
- "id": "00000000-0000-0000-0000-000000000902",
+ "id": "00000000-0000-0000-0000-000000000903",
},
"name": {
- "id": "00000000-0000-0000-0000-000000000890",
+ "id": "00000000-0000-0000-0000-000000000891",
},
"numberFormat": {
- "id": "00000000-0000-0000-0000-000000000910",
+ "id": "00000000-0000-0000-0000-000000000911",
},
"openRecordIn": {
- "id": "00000000-0000-0000-0000-000000000893",
+ "id": "00000000-0000-0000-0000-000000000894",
},
"ownedOpportunities": {
- "id": "00000000-0000-0000-0000-000000000900",
+ "id": "00000000-0000-0000-0000-000000000901",
},
"position": {
- "id": "00000000-0000-0000-0000-000000000888",
+ "id": "00000000-0000-0000-0000-000000000889",
},
"searchVector": {
- "id": "00000000-0000-0000-0000-000000000889",
+ "id": "00000000-0000-0000-0000-000000000890",
},
"timeFormat": {
- "id": "00000000-0000-0000-0000-000000000908",
+ "id": "00000000-0000-0000-0000-000000000909",
},
"timeZone": {
- "id": "00000000-0000-0000-0000-000000000906",
+ "id": "00000000-0000-0000-0000-000000000907",
},
"timelineActivities": {
- "id": "00000000-0000-0000-0000-000000000905",
+ "id": "00000000-0000-0000-0000-000000000906",
},
"uiScale": {
- "id": "00000000-0000-0000-0000-000000000892",
+ "id": "00000000-0000-0000-0000-000000000893",
},
"updatedAt": {
- "id": "00000000-0000-0000-0000-000000000884",
+ "id": "00000000-0000-0000-0000-000000000885",
},
"updatedBy": {
- "id": "00000000-0000-0000-0000-000000000887",
+ "id": "00000000-0000-0000-0000-000000000888",
},
"userEmail": {
- "id": "00000000-0000-0000-0000-000000000896",
+ "id": "00000000-0000-0000-0000-000000000897",
},
"userId": {
- "id": "00000000-0000-0000-0000-000000000898",
+ "id": "00000000-0000-0000-0000-000000000899",
},
},
- "id": "00000000-0000-0000-0000-000000000916",
+ "id": "00000000-0000-0000-0000-000000000917",
"views": {
"allWorkspaceMembers": {
- "id": "00000000-0000-0000-0000-000000000915",
+ "id": "00000000-0000-0000-0000-000000000916",
"viewFieldGroups": {},
"viewFields": {
"assignedTasks": {
- "id": "00000000-0000-0000-0000-000000000914",
+ "id": "00000000-0000-0000-0000-000000000915",
},
"createdAt": {
- "id": "00000000-0000-0000-0000-000000000912",
+ "id": "00000000-0000-0000-0000-000000000913",
},
"name": {
- "id": "00000000-0000-0000-0000-000000000911",
+ "id": "00000000-0000-0000-0000-000000000912",
},
"ownedOpportunities": {
- "id": "00000000-0000-0000-0000-000000000913",
+ "id": "00000000-0000-0000-0000-000000000914",
},
},
"viewGroups": {},
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-calendar-event-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-calendar-event-standard-flat-field-metadata.util.ts
index 980773cea40..a3539eb9d8f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-calendar-event-standard-flat-field-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-calendar-event-standard-flat-field-metadata.util.ts
@@ -1,5 +1,6 @@
import { msg } from '@lingui/core/macro';
import { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import {
DateDisplayFormat,
FieldMetadataType,
@@ -552,6 +553,9 @@ export const buildCalendarEventStandardFlatFieldMetadatas = ({
settings: {
relationType: RelationType.ONE_TO_MANY,
},
+ junctionTargetFieldUniversalIdentifier:
+ STANDARD_OBJECTS.calendarEventParticipant.fields.person
+ .universalIdentifier,
},
standardObjectMetadataRelatedEntityIds,
dependencyFlatEntityMaps,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-standard-flat-field-metadata.util.ts
index 75e1db2bdae..f68fb0d294e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-standard-flat-field-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-standard-flat-field-metadata.util.ts
@@ -1,5 +1,6 @@
import { msg } from '@lingui/core/macro';
import { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import {
DateDisplayFormat,
FieldMetadataType,
@@ -381,6 +382,8 @@ export const buildMessageStandardFlatFieldMetadatas = ({
settings: {
relationType: RelationType.ONE_TO_MANY,
},
+ junctionTargetFieldUniversalIdentifier:
+ STANDARD_OBJECTS.messageParticipant.fields.person.universalIdentifier,
},
standardObjectMetadataRelatedEntityIds,
dependencyFlatEntityMaps,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-timeline-activity-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-timeline-activity-standard-flat-field-metadata.util.ts
index 9cd4c268b30..707db287aa3 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-timeline-activity-standard-flat-field-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-timeline-activity-standard-flat-field-metadata.util.ts
@@ -234,6 +234,8 @@ export const buildTimelineActivityStandardFlatFieldMetadatas = ({
twentyStandardApplicationId,
now,
}),
+ // Kept through 2.34 so new workspaces remain writable by 2.33 pods during a
+ // rolling deployment. The 2.34 implementation ignores this field.
name: createStandardFieldFlatMetadata({
objectName,
workspaceId,
@@ -280,6 +282,32 @@ export const buildTimelineActivityStandardFlatFieldMetadatas = ({
twentyStandardApplicationId,
now,
}),
+ // A 2.33 pod cannot populate this field during the 2.34 rolling deployment.
+ timelineActivityTypeSnapshot: createStandardFieldFlatMetadata({
+ objectName,
+ workspaceId,
+ context: {
+ fieldName: 'timelineActivityTypeSnapshot',
+ type: FieldMetadataType.RAW_JSON,
+ label: i18nLabel(
+ msg({ message: `Event type`, context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: `Timeline activity type describing this event`,
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconArchive',
+ isSystem: true,
+ isNullable: true,
+ isUIEditable: false,
+ },
+ standardObjectMetadataRelatedEntityIds,
+ dependencyFlatEntityMaps,
+ twentyStandardApplicationId,
+ now,
+ }),
properties: createStandardFieldFlatMetadata({
objectName,
workspaceId,
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.ts
new file mode 100644
index 00000000000..84268da1119
--- /dev/null
+++ 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
@@ -0,0 +1,71 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS } from 'twenty-shared/timeline';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
+import { buildStandardFlatTimelineActivityTypeMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/timeline-activity-type/build-standard-flat-timeline-activity-type-maps.util';
+
+const getTimelineActivityTypeOrThrow = (
+ flatTimelineActivityTypeMaps: FlatEntityMaps<FlatTimelineActivityType>,
+ name: string,
+) => {
+ const timelineActivityType = Object.values(
+ flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ ).find((type) => type?.name === name);
+
+ if (!isDefined(timelineActivityType)) {
+ throw new Error(`Timeline activity type ${name} not found`);
+ }
+
+ return timelineActivityType;
+};
+
+const buildMaps = (
+ hiddenTimelineActivityTypeColumnPropertyNames: ReadonlySet<string>,
+) =>
+ buildStandardFlatTimelineActivityTypeMaps({
+ now: '2026-08-22T00:00:00.000Z',
+ workspaceId: '20202020-0000-4000-8000-000000000001',
+ twentyStandardApplicationId: '20202020-0000-4000-8000-000000000002',
+ hiddenTimelineActivityTypeColumnPropertyNames,
+ });
+
+describe('buildStandardFlatTimelineActivityTypeMaps', () => {
+ it('should omit routing properties before their upgrade command is applied', () => {
+ const maps = buildMaps(
+ new Set([
+ 'targetRelationFieldUniversalIdentifier',
+ 'triggerFieldUniversalIdentifiers',
+ ]),
+ );
+
+ expect(
+ getTimelineActivityTypeOrThrow(maps, 'messageLinked')
+ .targetRelationFieldUniversalIdentifier,
+ ).toBeNull();
+ expect(
+ getTimelineActivityTypeOrThrow(maps, 'noteUpdated')
+ .triggerFieldUniversalIdentifiers,
+ ).toBeNull();
+ });
+
+ it('should include routing properties after their upgrade command is applied', () => {
+ const maps = buildMaps(new Set());
+
+ expect(
+ getTimelineActivityTypeOrThrow(maps, 'messageLinked')
+ .targetRelationFieldUniversalIdentifier,
+ ).toBe(
+ STANDARD_OBJECTS.message.fields.messageParticipants.universalIdentifier,
+ );
+ expect(
+ getTimelineActivityTypeOrThrow(maps, 'noteUpdated')
+ .triggerFieldUniversalIdentifiers,
+ ).toEqual([STANDARD_OBJECTS.note.fields.title.universalIdentifier]);
+ expect(
+ getTimelineActivityTypeOrThrow(maps, 'messageLinked')
+ .frontComponentUniversalIdentifier,
+ ).toBe(STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message);
+ });
+});
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.ts
index 32a73e796e7..ee6846f66e4 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
@@ -5,6 +5,8 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
import { STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS } from 'src/engine/metadata-modules/timeline-activity-type/constants/standard-timeline-activity-type-definitions.constant';
+import { TimelineActivityTypeEntity } from 'src/engine/metadata-modules/timeline-activity-type/entities/timeline-activity-type.entity';
+import { UpgradeAwareRepositoryState } from 'src/engine/twenty-orm/upgrade-aware/upgrade-aware-repository-state';
import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
import { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
@@ -12,10 +14,14 @@ export const buildStandardFlatTimelineActivityTypeMaps = ({
now,
workspaceId,
twentyStandardApplicationId,
+ hiddenTimelineActivityTypeColumnPropertyNames = UpgradeAwareRepositoryState.getInstance().getHiddenColumnPropertyNames(
+ TimelineActivityTypeEntity,
+ ),
}: {
now: string;
workspaceId: string;
twentyStandardApplicationId: string;
+ hiddenTimelineActivityTypeColumnPropertyNames?: ReadonlySet<string>;
}): FlatEntityMaps<FlatTimelineActivityType> => {
let flatTimelineActivityTypeMaps = createEmptyFlatEntityMaps();
@@ -25,10 +31,32 @@ export const buildStandardFlatTimelineActivityTypeMaps = ({
id: v4(),
name: definition.name,
label: i18nLabel(definition.label),
- action: definition.action,
+ action: definition.emit.on,
icon: definition.icon,
- renderer: definition.renderer,
- objectUniversalIdentifier: definition.objectUniversalIdentifier,
+ frontComponentUniversalIdentifier:
+ hiddenTimelineActivityTypeColumnPropertyNames.has(
+ 'frontComponentUniversalIdentifier',
+ )
+ ? null
+ : definition.frontComponentUniversalIdentifier,
+ objectUniversalIdentifier: definition.emit.objectUniversalIdentifier,
+ targetRelationFieldUniversalIdentifier:
+ hiddenTimelineActivityTypeColumnPropertyNames.has(
+ 'targetRelationFieldUniversalIdentifier',
+ )
+ ? null
+ : (definition.emit.through?.relationFieldUniversalIdentifier ??
+ null),
+ triggerFieldUniversalIdentifiers:
+ hiddenTimelineActivityTypeColumnPropertyNames.has(
+ 'triggerFieldUniversalIdentifiers',
+ )
+ ? null
+ : (definition.emit.through?.triggerFieldUniversalIdentifiers ??
+ null),
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ isActive: true,
+ overrides: null,
workspaceId,
applicationId: twentyStandardApplicationId,
universalIdentifier: definition.universalIdentifier,
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.ts
new file mode 100644
index 00000000000..c8db6816f38
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/__tests__/flat-timeline-activity-type-validator.service.spec.ts
@@ -0,0 +1,130 @@
+import { STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS } from 'twenty-shared/timeline';
+
+import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
+import { FlatTimelineActivityTypeValidatorService } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/services/flat-timeline-activity-type-validator.service';
+
+const APPLICATION_UNIVERSAL_IDENTIFIER = '11111111-1111-4111-8111-111111111111';
+const TYPE_UNIVERSAL_IDENTIFIER = '22222222-2222-4222-8222-222222222222';
+
+const emptyMaps = () => ({ byUniversalIdentifier: {} });
+
+const buildCreationArgs = (
+ applicationUniversalIdentifier: string,
+ overrides: Partial<{
+ action: 'created' | 'linked';
+ objectUniversalIdentifier: string | null;
+ frontComponentUniversalIdentifier: string | null;
+ }> = {},
+) =>
+ ({
+ flatEntityToValidate: {
+ universalIdentifier: TYPE_UNIVERSAL_IDENTIFIER,
+ applicationUniversalIdentifier,
+ name: 'recordCreated',
+ label: 'was created by',
+ action: 'created',
+ icon: null,
+ frontComponentUniversalIdentifier: null,
+ objectUniversalIdentifier: null,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ isActive: true,
+ overrides: null,
+ createdAt: '2026-08-22T00:00:00.000Z',
+ updatedAt: '2026-08-22T00:00:00.000Z',
+ ...overrides,
+ },
+ optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
+ flatTimelineActivityTypeMaps: emptyMaps(),
+ flatFrontComponentMaps: emptyMaps(),
+ flatObjectMetadataMaps: emptyMaps(),
+ flatFieldMetadataMaps: emptyMaps(),
+ },
+ }) as unknown as Parameters<
+ FlatTimelineActivityTypeValidatorService['validateFlatTimelineActivityTypeCreation']
+ >[0];
+
+describe('FlatTimelineActivityTypeValidatorService', () => {
+ const service = new FlatTimelineActivityTypeValidatorService();
+
+ it('rejects a workspace-global emitter declared by an application', () => {
+ const result = service.validateFlatTimelineActivityTypeCreation(
+ buildCreationArgs(APPLICATION_UNIVERSAL_IDENTIFIER),
+ );
+
+ expect(result.errors).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ message:
+ 'An application timeline activity emitter must target one of its objects',
+ }),
+ ]),
+ );
+ });
+
+ it('keeps platform fallback emitters valid', () => {
+ const result = service.validateFlatTimelineActivityTypeCreation(
+ buildCreationArgs(TWENTY_STANDARD_APPLICATION.universalIdentifier),
+ );
+
+ expect(result.errors).toEqual([]);
+ });
+
+ it('rejects linked emitters without through routing', () => {
+ const result = service.validateFlatTimelineActivityTypeCreation(
+ buildCreationArgs(APPLICATION_UNIVERSAL_IDENTIFIER, {
+ action: 'linked',
+ objectUniversalIdentifier: '33333333-3333-4333-8333-333333333333',
+ }),
+ );
+
+ expect(result.errors).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ message:
+ 'Linked and unlinked timeline activity emitters require a target relation',
+ }),
+ ]),
+ );
+ });
+
+ it('allows a standard renderer owned by the standard application', () => {
+ const result = service.validateFlatTimelineActivityTypeCreation(
+ buildCreationArgs(TWENTY_STANDARD_APPLICATION.universalIdentifier, {
+ frontComponentUniversalIdentifier:
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message,
+ }),
+ );
+
+ expect(result.errors).toEqual([]);
+ });
+
+ it('does not expose standard renderers to installed applications', () => {
+ const creationArgs = buildCreationArgs(APPLICATION_UNIVERSAL_IDENTIFIER, {
+ objectUniversalIdentifier: '33333333-3333-4333-8333-333333333333',
+ frontComponentUniversalIdentifier:
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message,
+ });
+
+ creationArgs.optimisticFlatEntityMapsAndRelatedFlatEntityMaps.flatFrontComponentMaps.byUniversalIdentifier[
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message
+ ] = {
+ universalIdentifier:
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS.message,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ } as never;
+
+ const result =
+ service.validateFlatTimelineActivityTypeCreation(creationArgs);
+
+ expect(result.errors).toEqual(
+ expect.arrayContaining([
+ expect.objectContaining({
+ message:
+ 'Timeline activity type references a front component that does not belong to its application',
+ }),
+ ]),
+ );
+ });
+});
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.ts
index fc1e549c46d..b06968a4a4e 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
@@ -4,33 +4,38 @@ import { msg, t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { ALL_METADATA_NAME } from 'twenty-shared/metadata';
import {
+ isStandardTimelineActivityRendererUniversalIdentifier,
isTimelineActivityAction,
- isTimelineActivityRenderer,
- type TimelineActivityRenderer,
} from 'twenty-shared/timeline';
-import { isDefined } from 'twenty-shared/utils';
+import { 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';
import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
+import { isMorphOrRelationUniversalFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { TimelineActivityTypeExceptionCode } from 'src/engine/metadata-modules/timeline-activity-type/enums/timeline-activity-type-exception-code.enum';
+import { isValidTimelineActivityTypeOverride } from 'src/engine/metadata-modules/timeline-activity-type/utils/is-valid-timeline-activity-type-override.util';
+import { resolveTimelineActivityTypeOverride } from 'src/engine/metadata-modules/timeline-activity-type/utils/resolve-timeline-activity-type-override.util';
+import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';
import { type FailedFlatEntityValidation } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/types/failed-flat-entity-validation.type';
import { getEmptyFlatEntityValidationError } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/utils/get-flat-entity-validation-error.util';
import { type FlatEntityUpdateValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-update-validation-args.type';
import { type UniversalFlatEntityValidationArgs } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/types/universal-flat-entity-validation-args.type';
+import { type UniversalFlatTimelineActivityType } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-timeline-activity-type.type';
-// The two renderers that draw from the row itself rather than from a linked
-// record, so they need no object on the type.
-const UNBOUND_TIMELINE_ACTIVITY_RENDERERS: TimelineActivityRenderer[] = [
- 'mainObject',
- 'genericLinked',
-];
+type TimelineActivityTypeValidationMaps =
+ MetadataUniversalFlatEntityAndRelatedFlatEntityMapsForValidation<'timelineActivityType'>;
+
+type TimelineActivityTypeValidationResult = FailedFlatEntityValidation<
+ 'timelineActivityType',
+ 'create' | 'update'
+>;
@Injectable()
export class FlatTimelineActivityTypeValidatorService {
public validateFlatTimelineActivityTypeCreation({
flatEntityToValidate: flatTimelineActivityType,
- optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
- flatTimelineActivityTypeMaps: optimisticFlatTimelineActivityTypeMaps,
- },
+ optimisticFlatEntityMapsAndRelatedFlatEntityMaps: validationMaps,
}: UniversalFlatEntityValidationArgs<
typeof ALL_METADATA_NAME.timelineActivityType
>): FailedFlatEntityValidation<'timelineActivityType', 'create'> {
@@ -42,80 +47,11 @@ export class FlatTimelineActivityTypeValidatorService {
metadataName: 'timelineActivityType',
type: 'create',
});
-
- if (!isNonEmptyString(flatTimelineActivityType.name)) {
- validationResult.errors.push({
- code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
- message: t`Timeline activity type name is required`,
- userFriendlyMessage: msg`Timeline activity type name is required`,
- });
- }
-
- if (!isNonEmptyString(flatTimelineActivityType.label)) {
- validationResult.errors.push({
- code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
- message: t`Timeline activity type label is required`,
- userFriendlyMessage: msg`Timeline activity type label is required`,
- });
- }
-
- if (
- isDefined(flatTimelineActivityType.action) &&
- !isTimelineActivityAction(flatTimelineActivityType.action)
- ) {
- validationResult.errors.push({
- code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
- message: t`Unknown timeline activity action ${flatTimelineActivityType.action}`,
- userFriendlyMessage: msg`This timeline activity action is not supported`,
- });
- }
-
- if (
- isDefined(flatTimelineActivityType.renderer) &&
- !isTimelineActivityRenderer(flatTimelineActivityType.renderer)
- ) {
- validationResult.errors.push({
- code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
- message: t`Unknown timeline activity renderer ${flatTimelineActivityType.renderer}`,
- userFriendlyMessage: msg`This timeline activity renderer is not supported`,
- });
- }
-
- // Every renderer but the generic ones reads a linked record off the row, so
- // it only ever makes sense on a type bound to the object it draws.
- if (
- isDefined(flatTimelineActivityType.renderer) &&
- !UNBOUND_TIMELINE_ACTIVITY_RENDERERS.includes(
- flatTimelineActivityType.renderer,
- ) &&
- !isDefined(flatTimelineActivityType.objectUniversalIdentifier)
- ) {
- validationResult.errors.push({
- code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
- message: t`Timeline activity renderer ${flatTimelineActivityType.renderer} requires the type to reference an object`,
- userFriendlyMessage: msg`This timeline activity renderer requires the type to reference an object`,
- });
- }
-
- const existingByName = Object.values(
- optimisticFlatTimelineActivityTypeMaps.byUniversalIdentifier,
- ).find(
- (existing) =>
- isDefined(existing) &&
- existing.name === flatTimelineActivityType.name &&
- existing.applicationUniversalIdentifier ===
- flatTimelineActivityType.applicationUniversalIdentifier &&
- existing.universalIdentifier !==
- flatTimelineActivityType.universalIdentifier,
- );
-
- if (isDefined(existingByName)) {
- validationResult.errors.push({
- code: TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NAME_ALREADY_EXISTS,
- message: t`Timeline activity type with name ${flatTimelineActivityType.name} already exists for this application`,
- userFriendlyMessage: msg`A timeline activity type with this name already exists for this application`,
- });
- }
+ this.validateTimelineActivityTypeConfiguration({
+ timelineActivityType: flatTimelineActivityType,
+ validationMaps,
+ validationResult,
+ });
return validationResult;
}
@@ -155,12 +91,14 @@ export class FlatTimelineActivityTypeValidatorService {
public validateFlatTimelineActivityTypeUpdate({
universalIdentifier,
- optimisticFlatEntityMapsAndRelatedFlatEntityMaps: {
- flatTimelineActivityTypeMaps: optimisticFlatTimelineActivityTypeMaps,
- },
+ flatEntityUpdate,
+ optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
}: FlatEntityUpdateValidationArgs<
typeof ALL_METADATA_NAME.timelineActivityType
>): FailedFlatEntityValidation<'timelineActivityType', 'update'> {
+ const {
+ flatTimelineActivityTypeMaps: optimisticFlatTimelineActivityTypeMaps,
+ } = optimisticFlatEntityMapsAndRelatedFlatEntityMaps;
const validationResult = getEmptyFlatEntityValidationError({
flatEntityMinimalInformation: {
universalIdentifier,
@@ -180,8 +118,333 @@ export class FlatTimelineActivityTypeValidatorService {
message: t`Timeline activity type not found`,
userFriendlyMessage: msg`Timeline activity type not found`,
});
+ return validationResult;
}
+ const updatedTimelineActivityType = {
+ ...fromFlatTimelineActivityType,
+ ...flatEntityUpdate,
+ };
+
+ this.validateTimelineActivityTypeConfiguration({
+ timelineActivityType: updatedTimelineActivityType,
+ validationMaps: optimisticFlatEntityMapsAndRelatedFlatEntityMaps,
+ validationResult,
+ });
+
return validationResult;
}
+
+ private validateTimelineActivityTypeConfiguration({
+ timelineActivityType,
+ validationMaps,
+ validationResult,
+ }: {
+ timelineActivityType: UniversalFlatTimelineActivityType;
+ validationMaps: TimelineActivityTypeValidationMaps;
+ validationResult: TimelineActivityTypeValidationResult;
+ }): void {
+ if (!isNonEmptyString(timelineActivityType.name)) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type name is required`,
+ userFriendlyMessage: msg`Timeline activity type name is required`,
+ });
+ }
+
+ if (!isNonEmptyString(timelineActivityType.label)) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type label is required`,
+ userFriendlyMessage: msg`Timeline activity type label is required`,
+ });
+ }
+
+ if (
+ isDefined(timelineActivityType.action) &&
+ !isTimelineActivityAction(timelineActivityType.action)
+ ) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Unknown timeline activity action ${timelineActivityType.action}`,
+ userFriendlyMessage: msg`This timeline activity action is not supported`,
+ });
+ }
+
+ const existingByName = Object.values(
+ validationMaps.flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ ).find(
+ (existing) =>
+ isDefined(existing) &&
+ existing.universalIdentifier !==
+ timelineActivityType.universalIdentifier &&
+ existing.name === timelineActivityType.name &&
+ existing.applicationUniversalIdentifier ===
+ timelineActivityType.applicationUniversalIdentifier,
+ );
+
+ if (isDefined(existingByName)) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.TIMELINE_ACTIVITY_TYPE_NAME_ALREADY_EXISTS,
+ message: t`Timeline activity type with name ${timelineActivityType.name} already exists for this application`,
+ userFriendlyMessage: msg`A timeline activity type with this name already exists for this application`,
+ });
+ }
+
+ this.validateTimelineActivityTypeDependencies({
+ timelineActivityType,
+ validationMaps,
+ validationResult,
+ });
+ this.validateTimelineActivityTypeResolverConflict({
+ timelineActivityType,
+ validationMaps,
+ validationResult,
+ });
+ }
+
+ private validateTimelineActivityTypeDependencies({
+ timelineActivityType,
+ validationMaps,
+ validationResult,
+ }: {
+ timelineActivityType: UniversalFlatTimelineActivityType;
+ validationMaps: TimelineActivityTypeValidationMaps;
+ validationResult: TimelineActivityTypeValidationResult;
+ }): void {
+ const {
+ objectUniversalIdentifier,
+ frontComponentUniversalIdentifier,
+ targetRelationFieldUniversalIdentifier,
+ triggerFieldUniversalIdentifiers,
+ replacesTimelineActivityTypeUniversalIdentifier,
+ } = timelineActivityType;
+
+ const objectMetadata = isDefined(objectUniversalIdentifier)
+ ? validationMaps.flatObjectMetadataMaps.byUniversalIdentifier[
+ objectUniversalIdentifier
+ ]
+ : undefined;
+
+ if (isDefined(objectUniversalIdentifier) && !isDefined(objectMetadata)) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type references an object that does not exist`,
+ userFriendlyMessage: msg`The object used by this timeline activity type is not available`,
+ });
+ }
+
+ if (
+ isDefined(timelineActivityType.action) &&
+ !isDefined(objectUniversalIdentifier) &&
+ timelineActivityType.applicationUniversalIdentifier !==
+ TWENTY_STANDARD_APPLICATION.universalIdentifier
+ ) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`An application timeline activity emitter must target one of its objects`,
+ userFriendlyMessage: msg`Choose the object that emits this timeline activity type`,
+ });
+ }
+
+ if (
+ (timelineActivityType.action === 'linked' ||
+ timelineActivityType.action === 'unlinked') &&
+ !isDefined(targetRelationFieldUniversalIdentifier) &&
+ timelineActivityType.applicationUniversalIdentifier !==
+ TWENTY_STANDARD_APPLICATION.universalIdentifier
+ ) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Linked and unlinked timeline activity emitters require a target relation`,
+ userFriendlyMessage: msg`Choose the relation used by this timeline activity type`,
+ });
+ }
+
+ const overridesTimelineActivityType = isDefined(
+ replacesTimelineActivityTypeUniversalIdentifier,
+ )
+ ? validationMaps.flatTimelineActivityTypeMaps.byUniversalIdentifier[
+ replacesTimelineActivityTypeUniversalIdentifier
+ ]
+ : undefined;
+
+ const targetsAnotherApplication =
+ isDefined(timelineActivityType.action) &&
+ isDefined(objectMetadata) &&
+ objectMetadata.applicationUniversalIdentifier !==
+ timelineActivityType.applicationUniversalIdentifier;
+
+ if (
+ targetsAnotherApplication &&
+ !isDefined(replacesTimelineActivityTypeUniversalIdentifier)
+ ) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`A timeline activity type targeting another application's object must declare the timeline activity type it overrides`,
+ userFriendlyMessage: msg`Choose an existing timeline activity type to override`,
+ });
+ }
+
+ if (
+ isDefined(replacesTimelineActivityTypeUniversalIdentifier) &&
+ !isValidTimelineActivityTypeOverride({
+ timelineActivityType,
+ objectOwner: objectMetadata,
+ overriddenTimelineActivityType: overridesTimelineActivityType,
+ })
+ ) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type override must reference a compatible type owned by the target object's application`,
+ userFriendlyMessage: msg`The timeline activity type override is not compatible with this event`,
+ });
+ }
+
+ if (isDefined(targetRelationFieldUniversalIdentifier)) {
+ const targetRelationField =
+ validationMaps.flatFieldMetadataMaps.byUniversalIdentifier[
+ targetRelationFieldUniversalIdentifier
+ ];
+
+ if (
+ !isDefined(timelineActivityType.action) ||
+ !isDefined(objectUniversalIdentifier) ||
+ !isDefined(targetRelationField) ||
+ targetRelationField.objectMetadataUniversalIdentifier !==
+ objectUniversalIdentifier ||
+ !isMorphOrRelationUniversalFlatFieldMetadata(targetRelationField) ||
+ targetRelationField.universalSettings?.relationType !==
+ RelationType.ONE_TO_MANY ||
+ !isDefined(
+ targetRelationField.universalSettings
+ ?.junctionTargetFieldUniversalIdentifier,
+ )
+ ) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type target relation must be a junction relation on its source object`,
+ userFriendlyMessage: msg`The target relation used by this timeline activity type is not available`,
+ });
+ }
+ }
+
+ if (isDefined(triggerFieldUniversalIdentifiers)) {
+ const hasInvalidTriggerField =
+ timelineActivityType.action !== 'updated' ||
+ !isDefined(targetRelationFieldUniversalIdentifier) ||
+ !isNonEmptyArray(triggerFieldUniversalIdentifiers) ||
+ new Set(triggerFieldUniversalIdentifiers).size !==
+ triggerFieldUniversalIdentifiers.length ||
+ triggerFieldUniversalIdentifiers.some((universalIdentifier) => {
+ const triggerField =
+ validationMaps.flatFieldMetadataMaps.byUniversalIdentifier[
+ universalIdentifier
+ ];
+
+ return (
+ !isDefined(triggerField) ||
+ triggerField.objectMetadataUniversalIdentifier !==
+ objectUniversalIdentifier
+ );
+ });
+
+ if (hasInvalidTriggerField) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type trigger fields must be non-empty fields on the source object of an updated relation event`,
+ userFriendlyMessage: msg`The trigger fields used by this timeline activity type are not available`,
+ });
+ }
+ }
+
+ if (!isDefined(frontComponentUniversalIdentifier)) {
+ return;
+ }
+
+ const isStandardRenderer =
+ isStandardTimelineActivityRendererUniversalIdentifier(
+ frontComponentUniversalIdentifier,
+ );
+ const usesStandardRenderer =
+ isStandardRenderer &&
+ timelineActivityType.applicationUniversalIdentifier ===
+ TWENTY_STANDARD_APPLICATION.universalIdentifier;
+
+ if (usesStandardRenderer) {
+ return;
+ }
+
+ const frontComponent =
+ validationMaps.flatFrontComponentMaps.byUniversalIdentifier[
+ frontComponentUniversalIdentifier
+ ];
+
+ if (
+ isStandardRenderer ||
+ !isDefined(frontComponent) ||
+ frontComponent.applicationUniversalIdentifier !==
+ timelineActivityType.applicationUniversalIdentifier
+ ) {
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type references a front component that does not belong to its application`,
+ userFriendlyMessage: msg`The front component used by this timeline activity type is not available`,
+ });
+ }
+ }
+
+ private validateTimelineActivityTypeResolverConflict({
+ timelineActivityType,
+ validationMaps,
+ validationResult,
+ }: {
+ timelineActivityType: UniversalFlatTimelineActivityType;
+ validationMaps: TimelineActivityTypeValidationMaps;
+ validationResult: TimelineActivityTypeValidationResult;
+ }): void {
+ if (!isDefined(timelineActivityType.action)) {
+ return;
+ }
+
+ const existingTimelineActivityTypes = Object.values(
+ validationMaps.flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ ).filter(isDefined);
+ const resolverCandidates = [
+ ...existingTimelineActivityTypes.filter(
+ (existing) =>
+ existing.universalIdentifier !==
+ timelineActivityType.universalIdentifier &&
+ existing.action === timelineActivityType.action &&
+ existing.objectUniversalIdentifier ===
+ timelineActivityType.objectUniversalIdentifier &&
+ existing.targetRelationFieldUniversalIdentifier ===
+ timelineActivityType.targetRelationFieldUniversalIdentifier,
+ ),
+ timelineActivityType,
+ ];
+ const effectiveTimelineActivityType = resolveTimelineActivityTypeOverride(
+ resolverCandidates,
+ new Set([
+ ...existingTimelineActivityTypes.map(
+ (existing) => existing.universalIdentifier,
+ ),
+ timelineActivityType.universalIdentifier,
+ ]),
+ );
+
+ if (!isDefined(effectiveTimelineActivityType)) {
+ const conflictingResolverType = resolverCandidates.find(
+ (candidate) =>
+ candidate.universalIdentifier !==
+ timelineActivityType.universalIdentifier,
+ );
+
+ validationResult.errors.push({
+ code: TimelineActivityTypeExceptionCode.INVALID_TIMELINE_ACTIVITY_TYPE_INPUT,
+ message: t`Timeline activity type conflicts with ${conflictingResolverType?.name ?? timelineActivityType.name} for the same action, object, and target relation`,
+ userFriendlyMessage: msg`Another timeline activity type already handles this action, object, and target relation`,
+ });
+ }
+ }
}
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts
index c6603859e2c..e96d51a6061 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/calendar-event-participant-manager.module.ts
@@ -1,53 +1,29 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.module';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceFeatureFlagsMapCacheService } from 'src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.service';
-import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
-import { GetDataFromCacheWithRecomputeService } from 'src/engine/workspace-cache-storage/services/get-data-from-cache-with-recompute.service';
-import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
-import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
import { CalendarEventParticipantMatchParticipantJob } from 'src/modules/calendar/calendar-event-participant-manager/jobs/calendar-event-participant-match-participant.job';
import { CalendarEventParticipantPersonListener } from 'src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener';
import { CalendarEventParticipantWorkspaceMemberListener } from 'src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener';
-import { CalendarEventParticipantListener } from 'src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener';
import { CalendarEventParticipantService } from 'src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service';
import { ContactCreationManagerModule } from 'src/modules/contact-creation-manager/contact-creation-manager.module';
import { MatchParticipantModule } from 'src/modules/match-participant/match-participant.module';
-import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';
@Module({
imports: [
WorkspaceDataSourceModule,
WorkspaceModule,
- TypeOrmModule.forFeature([
- ObjectMetadataEntity,
- FieldMetadataEntity,
- FeatureFlagEntity,
- WorkspaceEntity,
- ]),
+ TypeOrmModule.forFeature([WorkspaceEntity]),
ContactCreationManagerModule,
MatchParticipantModule,
- WorkspaceCacheModule,
- TimelineActivityModule,
],
providers: [
CalendarEventParticipantService,
CalendarEventParticipantMatchParticipantJob,
- CalendarEventParticipantListener,
CalendarEventParticipantPersonListener,
CalendarEventParticipantWorkspaceMemberListener,
- FeatureFlagService,
- WorkspaceFeatureFlagsMapCacheService,
- WorkspaceCacheStorageService,
- GetDataFromCacheWithRecomputeService,
- provideWorkspaceScopedRepository(FeatureFlagEntity),
],
exports: [CalendarEventParticipantService],
})
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts
deleted file mode 100644
index 4beab8d7484..00000000000
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant.listener.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { isDefined } from 'twenty-shared/utils';
-import { Repository } from 'typeorm';
-
-import { OnCustomBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-custom-batch-event.decorator';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { CustomWorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/custom-workspace-batch-event.type';
-import { type CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
-import { TimelineActivityRepository } from 'src/modules/timeline/repositories/timeline-activity.repository';
-import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';
-import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
-
-@Injectable()
-export class CalendarEventParticipantListener {
- constructor(
- @InjectObjectMetadataRepository(TimelineActivityWorkspaceEntity)
- private readonly timelineActivityRepository: TimelineActivityRepository,
- @InjectRepository(ObjectMetadataEntity)
- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
- private readonly featureFlagService: FeatureFlagService,
- private readonly timelineActivityTypeCacheService: TimelineActivityTypeCacheService,
- ) {}
-
- @OnCustomBatchEvent('calendarEventParticipant_matched')
- public async handleCalendarEventParticipantMatchedEvent(
- batchEvent: CustomWorkspaceEventBatch<{
- workspaceMemberId: string;
- participants: CalendarEventParticipantWorkspaceEntity[];
- }>,
- ): Promise<void> {
- if (!isDefined(batchEvent.workspaceId)) {
- return;
- }
-
- const calendarEventObjectMetadata =
- await this.objectMetadataRepository.findOneOrFail({
- where: {
- nameSingular: 'calendarEvent',
- workspaceId: batchEvent.workspaceId,
- },
- });
-
- const resolveTimelineActivityTypeId =
- await this.timelineActivityTypeCacheService.getTimelineActivityTypeResolver(
- batchEvent.workspaceId,
- );
-
- const timelineActivityTypeId = resolveTimelineActivityTypeId({
- action: 'linked',
- objectUniversalIdentifier:
- STANDARD_OBJECTS.calendarEvent.universalIdentifier,
- });
-
- if (!isDefined(timelineActivityTypeId)) {
- return;
- }
-
- const timelineActivityPayloads = batchEvent.events.flatMap((event) => {
- const calendarEventParticipants = event.participants ?? [];
-
- const calendarEventParticipantsWithPersonId =
- calendarEventParticipants.filter((participant) =>
- isDefined(participant.personId),
- );
-
- if (calendarEventParticipantsWithPersonId.length === 0) {
- return;
- }
-
- return calendarEventParticipantsWithPersonId
- .map((participant) => {
- if (!isDefined(participant.personId)) {
- return;
- }
-
- return {
- name: 'calendarEvent.linked',
- timelineActivityTypeId,
- properties: {},
- objectSingularName: 'person',
- recordId: participant.personId,
- workspaceMemberId: event.workspaceMemberId,
- linkedObjectMetadataId: calendarEventObjectMetadata.id,
- linkedRecordId: participant.calendarEventId,
- linkedRecordCachedName: '',
- };
- })
- .filter(isDefined);
- });
-
- await this.timelineActivityRepository.upsertTimelineActivities({
- objectSingularName: 'person',
- workspaceId: batchEvent.workspaceId,
- payloads: timelineActivityPayloads.filter(isDefined),
- });
- }
-}
diff --git a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts b/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
index 54de38ee7cb..d8c139e931f 100644
--- a/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
+++ b/packages/twenty-server/src/modules/match-participant/match-participant.service.ts
@@ -7,7 +7,6 @@ import { Any, In } from 'typeorm';
import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
import { type WorkspaceTransactionScope } from 'src/engine/twenty-orm/global-workspace-datasource/types/workspace-transaction-scope.type';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
import { type CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
import { addPersonEmailFiltersToQueryBuilder } from 'src/modules/match-participant/utils/add-person-email-filters-to-query-builder';
import { findPersonByPrimaryOrAdditionalEmail } from 'src/modules/match-participant/utils/find-person-by-primary-or-additional-email';
@@ -65,7 +64,6 @@ export class MatchParticipantService<
| MessageParticipantWorkspaceEntity,
> {
constructor(
- private readonly workspaceEventEmitter: WorkspaceEventEmitter,
private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
) {}
@@ -209,17 +207,6 @@ export class MatchParticipantService<
},
})),
);
-
- this.workspaceEventEmitter.emitCustomBatchEvent(
- `${objectMetadataName}_matched`,
- [
- {
- workspaceMemberId: null,
- participants: partipantsToBeUpdated,
- },
- ],
- workspaceId,
- );
}
}
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts
deleted file mode 100644
index 014e74d6bf5..00000000000
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant.listener.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-import { isDefined } from 'twenty-shared/utils';
-import { Repository } from 'typeorm';
-
-import { OnCustomBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-custom-batch-event.decorator';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { CustomWorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/custom-workspace-batch-event.type';
-import { type MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
-import { TimelineActivityRepository } from 'src/modules/timeline/repositories/timeline-activity.repository';
-import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';
-import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
-
-@Injectable()
-export class MessageParticipantListener {
- constructor(
- @InjectObjectMetadataRepository(TimelineActivityWorkspaceEntity)
- private readonly timelineActivityRepository: TimelineActivityRepository,
- @InjectRepository(ObjectMetadataEntity)
- private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
- private readonly featureFlagService: FeatureFlagService,
- private readonly timelineActivityTypeCacheService: TimelineActivityTypeCacheService,
- ) {}
-
- @OnCustomBatchEvent('messageParticipant_matched')
- public async handleMessageParticipantMatched(
- batchEvent: CustomWorkspaceEventBatch<{
- workspaceMemberId: string;
- participants: MessageParticipantWorkspaceEntity[];
- }>,
- ): Promise<void> {
- if (!isDefined(batchEvent.workspaceId)) {
- return;
- }
-
- const messageObjectMetadata =
- await this.objectMetadataRepository.findOneOrFail({
- where: {
- nameSingular: 'message',
- workspaceId: batchEvent.workspaceId,
- },
- });
-
- const resolveTimelineActivityTypeId =
- await this.timelineActivityTypeCacheService.getTimelineActivityTypeResolver(
- batchEvent.workspaceId,
- );
-
- const timelineActivityTypeId = resolveTimelineActivityTypeId({
- action: 'linked',
- objectUniversalIdentifier: STANDARD_OBJECTS.message.universalIdentifier,
- });
-
- if (!isDefined(timelineActivityTypeId)) {
- return;
- }
-
- const timelineActivityPayloads = batchEvent.events.flatMap((event) => {
- const messageParticipants = event.participants ?? [];
-
- const messageParticipantsWithPersonId = messageParticipants.filter(
- (participant) => isDefined(participant.personId),
- );
-
- if (messageParticipantsWithPersonId.length === 0) {
- return;
- }
-
- return messageParticipantsWithPersonId
- .map((participant) => {
- if (!isDefined(participant.personId)) {
- return;
- }
-
- return {
- name: 'message.linked',
- timelineActivityTypeId,
- properties: {},
- objectSingularName: 'person',
- recordId: participant.personId,
- workspaceMemberId: event.workspaceMemberId,
- linkedObjectMetadataId: messageObjectMetadata.id,
- linkedRecordId: participant.messageId,
- linkedRecordCachedName: '',
- };
- })
- .filter(isDefined);
- });
-
- await this.timelineActivityRepository.upsertTimelineActivities({
- objectSingularName: 'person',
- workspaceId: batchEvent.workspaceId,
- payloads: timelineActivityPayloads.filter(isDefined),
- });
- }
-}
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts
index 3ad43e572c0..3801d08779f 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/message-participant-manager.module.ts
@@ -1,18 +1,7 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';
-import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';
-import { WorkspaceFeatureFlagsMapCacheService } from 'src/engine/metadata-modules/workspace-feature-flags-map-cache/workspace-feature-flags-map-cache.service';
-import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
-import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
-import { GetDataFromCacheWithRecomputeService } from 'src/engine/workspace-cache-storage/services/get-data-from-cache-with-recompute.service';
-import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
-import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
import { ContactCreationManagerModule } from 'src/modules/contact-creation-manager/contact-creation-manager.module';
import { MatchParticipantModule } from 'src/modules/match-participant/match-participant.module';
@@ -20,41 +9,21 @@ import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-co
import { MessageParticipantMatchParticipantJob } from 'src/modules/messaging/message-participant-manager/jobs/message-participant-match-participant.job';
import { MessageParticipantPersonListener } from 'src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener';
import { MessageParticipantWorkspaceMemberListener } from 'src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener';
-import { MessageParticipantListener } from 'src/modules/messaging/message-participant-manager/listeners/message-participant.listener';
import { MessagingMessageParticipantService } from 'src/modules/messaging/message-participant-manager/services/messaging-message-participant.service';
-import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
-import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';
@Module({
imports: [
- TypeOrmModule.forFeature([
- FeatureFlagEntity,
- WorkspaceEntity,
- ObjectMetadataEntity,
- RoleEntity,
- RoleTargetEntity,
- ]),
+ TypeOrmModule.forFeature([WorkspaceEntity]),
ContactCreationManagerModule,
WorkspaceDataSourceModule,
- ObjectMetadataRepositoryModule.forFeature([
- TimelineActivityWorkspaceEntity,
- ]),
MessagingCommonModule,
MatchParticipantModule,
- WorkspaceCacheModule,
- TimelineActivityModule,
],
providers: [
MessagingMessageParticipantService,
MessageParticipantMatchParticipantJob,
- MessageParticipantListener,
MessageParticipantPersonListener,
MessageParticipantWorkspaceMemberListener,
- FeatureFlagService,
- WorkspaceFeatureFlagsMapCacheService,
- WorkspaceCacheStorageService,
- GetDataFromCacheWithRecomputeService,
- provideWorkspaceScopedRepository(FeatureFlagEntity),
],
exports: [MessagingMessageParticipantService],
})
diff --git a/packages/twenty-server/src/modules/timeline/constants/standard-timeline-activity-rules.constant.ts b/packages/twenty-server/src/modules/timeline/constants/standard-timeline-activity-rules.constant.ts
deleted file mode 100644
index 24e99d5edea..00000000000
--- a/packages/twenty-server/src/modules/timeline/constants/standard-timeline-activity-rules.constant.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
-
-import { type TimelineActivityRuleAction } from 'src/modules/timeline/types/timeline-activity-rule-action.type';
-
-type StandardTimelineActivityRule = {
- objectUniversalIdentifier: string;
- relationFieldUniversalIdentifier: string;
- actions: TimelineActivityRuleAction[];
- triggerFieldUniversalIdentifiers: string[] | null;
-};
-
-// Activity fan-out is not derived from metadata: deriving one rule per junction
-// relation would silently switch on every junction, messageList.members
-// included. Notes and tasks are declared instead.
-export const STANDARD_TIMELINE_ACTIVITY_RULES: StandardTimelineActivityRule[] =
- [
- {
- objectUniversalIdentifier: STANDARD_OBJECTS.note.universalIdentifier,
- relationFieldUniversalIdentifier:
- STANDARD_OBJECTS.note.fields.noteTargets.universalIdentifier,
- actions: ['updated', 'linked', 'unlinked'],
- triggerFieldUniversalIdentifiers: [
- STANDARD_OBJECTS.note.fields.title.universalIdentifier,
- ],
- },
- {
- objectUniversalIdentifier: STANDARD_OBJECTS.task.universalIdentifier,
- relationFieldUniversalIdentifier:
- STANDARD_OBJECTS.task.fields.taskTargets.universalIdentifier,
- actions: ['updated', 'linked', 'unlinked'],
- triggerFieldUniversalIdentifiers: [
- STANDARD_OBJECTS.task.fields.title.universalIdentifier,
- ],
- },
- ];
diff --git a/packages/twenty-server/src/modules/timeline/exceptions/timeline.exception.ts b/packages/twenty-server/src/modules/timeline/exceptions/timeline.exception.ts
new file mode 100644
index 00000000000..105fde197d3
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/exceptions/timeline.exception.ts
@@ -0,0 +1,16 @@
+import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
+import { CustomException } from 'src/utils/custom-exception';
+
+export enum TimelineExceptionCode {
+ TIMELINE_ACTIVITY_TYPE_RESOLUTION_FAILED = 'TIMELINE_ACTIVITY_TYPE_RESOLUTION_FAILED',
+}
+
+export class TimelineException extends CustomException<TimelineExceptionCode> {
+ constructor(message: string) {
+ super(
+ message,
+ TimelineExceptionCode.TIMELINE_ACTIVITY_TYPE_RESOLUTION_FAILED,
+ { userFriendlyMessage: STANDARD_ERROR_MESSAGE },
+ );
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/__tests__/timeline-activity-update-one.pre-query-hook.spec.ts b/packages/twenty-server/src/modules/timeline/query-hooks/__tests__/timeline-activity-update-one.pre-query-hook.spec.ts
new file mode 100644
index 00000000000..a71b40bdfdc
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/__tests__/timeline-activity-update-one.pre-query-hook.spec.ts
@@ -0,0 +1,16 @@
+import { TimelineActivityUpdateOnePreQueryHook } from 'src/modules/timeline/query-hooks/timeline-activity-update-one.pre-query-hook';
+
+describe('TimelineActivityUpdateOnePreQueryHook', () => {
+ it('does not let an application change the attributed workspace member', async () => {
+ const hook = new TimelineActivityUpdateOnePreQueryHook();
+
+ await expect(
+ hook.execute({ type: 'application' } as never, 'timelineActivity', {
+ data: {
+ workspaceMemberId: '00000000-0000-4000-8000-000000000001',
+ },
+ filter: { id: { eq: 'activity-id' } },
+ } as never),
+ ).resolves.toMatchObject({ data: { workspaceMemberId: null } });
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-create-many.pre-query-hook.ts b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-create-many.pre-query-hook.ts
new file mode 100644
index 00000000000..b450eb84be1
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-create-many.pre-query-hook.ts
@@ -0,0 +1,34 @@
+import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { type CreateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { TimelineActivityMutationQueryHookService } from 'src/modules/timeline/query-hooks/timeline-activity-mutation-query-hook.service';
+import { type TimelineActivityMutationInput } from 'src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type';
+
+@WorkspaceQueryHook('timelineActivity.createMany')
+export class TimelineActivityCreateManyPreQueryHook implements WorkspacePreQueryHookInstance {
+ constructor(
+ private readonly timelineActivityMutationQueryHookService: TimelineActivityMutationQueryHookService,
+ ) {}
+
+ async execute(
+ authContext: WorkspaceAuthContext,
+ _objectName: string,
+ payload: CreateManyResolverArgs<TimelineActivityMutationInput>,
+ ): Promise<CreateManyResolverArgs<TimelineActivityMutationInput>> {
+ return {
+ ...payload,
+ data: await this.timelineActivityMutationQueryHookService.stampTimelineActivityTypeSnapshot(
+ {
+ workspaceId: authContext.workspace.id,
+ applicationId:
+ authContext.type === 'application'
+ ? authContext.application.id
+ : undefined,
+ records: payload.data,
+ upsert: payload.upsert,
+ },
+ ),
+ };
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-create-one.pre-query-hook.ts b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-create-one.pre-query-hook.ts
new file mode 100644
index 00000000000..28768eacb70
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-create-one.pre-query-hook.ts
@@ -0,0 +1,34 @@
+import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { type CreateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { TimelineActivityMutationQueryHookService } from 'src/modules/timeline/query-hooks/timeline-activity-mutation-query-hook.service';
+import { type TimelineActivityMutationInput } from 'src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type';
+
+@WorkspaceQueryHook('timelineActivity.createOne')
+export class TimelineActivityCreateOnePreQueryHook implements WorkspacePreQueryHookInstance {
+ constructor(
+ private readonly timelineActivityMutationQueryHookService: TimelineActivityMutationQueryHookService,
+ ) {}
+
+ async execute(
+ authContext: WorkspaceAuthContext,
+ _objectName: string,
+ payload: CreateOneResolverArgs<TimelineActivityMutationInput>,
+ ): Promise<CreateOneResolverArgs<TimelineActivityMutationInput>> {
+ const [data] =
+ await this.timelineActivityMutationQueryHookService.stampTimelineActivityTypeSnapshot(
+ {
+ workspaceId: authContext.workspace.id,
+ applicationId:
+ authContext.type === 'application'
+ ? authContext.application.id
+ : undefined,
+ records: [payload.data],
+ upsert: payload.upsert,
+ },
+ );
+
+ return { ...payload, data };
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-mutation-query-hook.service.ts b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-mutation-query-hook.service.ts
new file mode 100644
index 00000000000..89bf5f13da1
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-mutation-query-hook.service.ts
@@ -0,0 +1,57 @@
+import { Injectable } from '@nestjs/common';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';
+import { type TimelineActivityMutationInput } from 'src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type';
+import {
+ assertTimelineActivityCreationInputIsValid,
+ stampTimelineActivityTypeSnapshots,
+} from 'src/modules/timeline/query-hooks/utils/timeline-activity-mutation-input.util';
+
+@Injectable()
+export class TimelineActivityMutationQueryHookService {
+ constructor(
+ private readonly timelineActivityTypeCacheService: TimelineActivityTypeCacheService,
+ ) {}
+
+ async stampTimelineActivityTypeSnapshot({
+ workspaceId,
+ applicationId,
+ records,
+ upsert,
+ }: {
+ workspaceId: string;
+ applicationId?: string;
+ records: TimelineActivityMutationInput[];
+ upsert?: boolean;
+ }): Promise<TimelineActivityMutationInput[]> {
+ assertTimelineActivityCreationInputIsValid({ records, upsert });
+
+ const resolvedTimelineActivityTypeById = new Map(
+ await Promise.all(
+ [
+ ...new Set(
+ records
+ .map(({ timelineActivityTypeId }) => timelineActivityTypeId)
+ .filter(isDefined),
+ ),
+ ].map(
+ async (timelineActivityTypeId) =>
+ [
+ timelineActivityTypeId,
+ await this.timelineActivityTypeCacheService.getTimelineActivityTypeByIdOrThrow(
+ { workspaceId, timelineActivityTypeId },
+ ),
+ ] as const,
+ ),
+ ),
+ );
+
+ return stampTimelineActivityTypeSnapshots({
+ applicationId,
+ records,
+ resolvedTimelineActivityTypeById,
+ });
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-update-many.pre-query-hook.ts b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-update-many.pre-query-hook.ts
new file mode 100644
index 00000000000..315b3847c6d
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-update-many.pre-query-hook.ts
@@ -0,0 +1,27 @@
+import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { type UpdateManyResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { type TimelineActivityMutationInput } from 'src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type';
+import {
+ assertTimelineActivityTypeIsNotUpdated,
+ sanitizeApplicationTimelineActivityInput,
+} from 'src/modules/timeline/query-hooks/utils/timeline-activity-mutation-input.util';
+
+@WorkspaceQueryHook('timelineActivity.updateMany')
+export class TimelineActivityUpdateManyPreQueryHook implements WorkspacePreQueryHookInstance {
+ async execute(
+ authContext: WorkspaceAuthContext,
+ _objectName: string,
+ payload: UpdateManyResolverArgs<TimelineActivityMutationInput>,
+ ): Promise<UpdateManyResolverArgs<TimelineActivityMutationInput>> {
+ const data =
+ authContext.type === 'application'
+ ? sanitizeApplicationTimelineActivityInput({ record: payload.data })
+ : payload.data;
+
+ assertTimelineActivityTypeIsNotUpdated([data]);
+
+ return { ...payload, data };
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-update-one.pre-query-hook.ts b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-update-one.pre-query-hook.ts
new file mode 100644
index 00000000000..e7a0fc08dca
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-activity-update-one.pre-query-hook.ts
@@ -0,0 +1,27 @@
+import { type WorkspacePreQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
+import { type UpdateOneResolverArgs } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
+import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
+import { type TimelineActivityMutationInput } from 'src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type';
+import {
+ assertTimelineActivityTypeIsNotUpdated,
+ sanitizeApplicationTimelineActivityInput,
+} from 'src/modules/timeline/query-hooks/utils/timeline-activity-mutation-input.util';
+
+@WorkspaceQueryHook('timelineActivity.updateOne')
+export class TimelineActivityUpdateOnePreQueryHook implements WorkspacePreQueryHookInstance {
+ async execute(
+ authContext: WorkspaceAuthContext,
+ _objectName: string,
+ payload: UpdateOneResolverArgs<TimelineActivityMutationInput>,
+ ): Promise<UpdateOneResolverArgs<TimelineActivityMutationInput>> {
+ const data =
+ authContext.type === 'application'
+ ? sanitizeApplicationTimelineActivityInput({ record: payload.data })
+ : payload.data;
+
+ assertTimelineActivityTypeIsNotUpdated([data]);
+
+ return { ...payload, data };
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/timeline-query-hook.module.ts b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-query-hook.module.ts
new file mode 100644
index 00000000000..3afbeb7866b
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/timeline-query-hook.module.ts
@@ -0,0 +1,20 @@
+import { Module } from '@nestjs/common';
+
+import { TimelineActivityCreateManyPreQueryHook } from 'src/modules/timeline/query-hooks/timeline-activity-create-many.pre-query-hook';
+import { TimelineActivityCreateOnePreQueryHook } from 'src/modules/timeline/query-hooks/timeline-activity-create-one.pre-query-hook';
+import { TimelineActivityMutationQueryHookService } from 'src/modules/timeline/query-hooks/timeline-activity-mutation-query-hook.service';
+import { TimelineActivityUpdateManyPreQueryHook } from 'src/modules/timeline/query-hooks/timeline-activity-update-many.pre-query-hook';
+import { TimelineActivityUpdateOnePreQueryHook } from 'src/modules/timeline/query-hooks/timeline-activity-update-one.pre-query-hook';
+import { TimelineActivityModule } from 'src/modules/timeline/timeline-activity.module';
+
+@Module({
+ imports: [TimelineActivityModule],
+ providers: [
+ TimelineActivityMutationQueryHookService,
+ TimelineActivityCreateOnePreQueryHook,
+ TimelineActivityCreateManyPreQueryHook,
+ TimelineActivityUpdateOnePreQueryHook,
+ TimelineActivityUpdateManyPreQueryHook,
+ ],
+})
+export class TimelineQueryHookModule {}
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type.ts b/packages/twenty-server/src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type.ts
new file mode 100644
index 00000000000..3f895b58b93
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type.ts
@@ -0,0 +1,7 @@
+export type TimelineActivityMutationInput = Record<string, unknown> & {
+ happensAt?: Date | string | null;
+ linkedObjectMetadataId?: string | null;
+ linkedRecordId?: string | null;
+ timelineActivityTypeId?: string | null;
+ workspaceMemberId?: string | null;
+};
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/utils/__tests__/timeline-activity-mutation-input.util.spec.ts b/packages/twenty-server/src/modules/timeline/query-hooks/utils/__tests__/timeline-activity-mutation-input.util.spec.ts
new file mode 100644
index 00000000000..c3f01661a40
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/utils/__tests__/timeline-activity-mutation-input.util.spec.ts
@@ -0,0 +1,181 @@
+import {
+ assertTimelineActivityCreationInputIsValid,
+ assertTimelineActivityTypeIsNotUpdated,
+ stampTimelineActivityTypeSnapshots,
+} from 'src/modules/timeline/query-hooks/utils/timeline-activity-mutation-input.util';
+
+const TYPE_ID = '00000000-0000-4000-8000-000000000001';
+const APPLICATION_ID = '00000000-0000-4000-8000-000000000004';
+
+const snapshot = {
+ id: TYPE_ID,
+ universalIdentifier: '00000000-0000-4000-8000-000000000002',
+ name: 'deploymentCompleted',
+ label: 'completed a deployment',
+ action: 'updated' as const,
+ icon: 'IconRocket',
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: '00000000-0000-4000-8000-000000000003',
+};
+
+const resolvedTimelineActivityTypeById = new Map([
+ [
+ TYPE_ID,
+ {
+ id: TYPE_ID,
+ applicationId: APPLICATION_ID,
+ snapshot,
+ },
+ ],
+]);
+
+describe('timeline activity mutation input', () => {
+ it('replaces client-provided snapshots with the resolved snapshot', () => {
+ expect(
+ stampTimelineActivityTypeSnapshots({
+ records: [
+ {
+ timelineActivityTypeId: TYPE_ID,
+ timelineActivityTypeSnapshot: { label: 'forged' },
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ },
+ ],
+ resolvedTimelineActivityTypeById,
+ }),
+ ).toEqual([
+ {
+ timelineActivityTypeId: TYPE_ID,
+ timelineActivityTypeSnapshot: snapshot,
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ },
+ ]);
+ });
+
+ it('rejects missing targets and partial linked records', () => {
+ expect(() =>
+ assertTimelineActivityCreationInputIsValid({
+ records: [{ timelineActivityTypeId: TYPE_ID }],
+ }),
+ ).toThrow('A timeline activity requires exactly one target');
+ expect(() =>
+ assertTimelineActivityCreationInputIsValid({
+ records: [
+ {
+ timelineActivityTypeId: TYPE_ID,
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ linkedRecordId: '00000000-0000-4000-8000-000000000012',
+ },
+ ],
+ }),
+ ).toThrow('complete linked record metadata');
+ });
+
+ it('accepts a nested target relation input', () => {
+ expect(() =>
+ assertTimelineActivityCreationInputIsValid({
+ records: [
+ {
+ timelineActivityTypeId: TYPE_ID,
+ targetPerson: {
+ connect: { id: '00000000-0000-4000-8000-000000000010' },
+ },
+ },
+ ],
+ }),
+ ).not.toThrow();
+ });
+
+ it('rejects targets split across scalar and nested relation inputs', () => {
+ expect(() =>
+ assertTimelineActivityCreationInputIsValid({
+ records: [
+ {
+ timelineActivityTypeId: TYPE_ID,
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ targetCompany: {
+ connect: { id: '00000000-0000-4000-8000-000000000011' },
+ },
+ },
+ ],
+ }),
+ ).toThrow('A timeline activity requires exactly one target');
+ });
+
+ it('rejects an untyped timeline activity', () => {
+ expect(() =>
+ assertTimelineActivityCreationInputIsValid({
+ records: [
+ {
+ properties: {},
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ },
+ ],
+ }),
+ ).toThrow('A timeline activity type is required on creation');
+ });
+
+ it('rejects upserts', () => {
+ expect(() =>
+ assertTimelineActivityCreationInputIsValid({ records: [], upsert: true }),
+ ).toThrow('Timeline activities cannot be upserted');
+ });
+
+ it('prevents an application from writing another application type', () => {
+ expect(() =>
+ stampTimelineActivityTypeSnapshots({
+ applicationId: '00000000-0000-4000-8000-000000000099',
+ records: [
+ {
+ timelineActivityTypeId: TYPE_ID,
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ },
+ ],
+ resolvedTimelineActivityTypeById,
+ }),
+ ).toThrow('An application can only create its own timeline activity types');
+ });
+
+ it('does not let an application attribute an activity to a workspace member', () => {
+ const now = new Date('2026-08-23T12:00:00.000Z');
+
+ expect(
+ stampTimelineActivityTypeSnapshots({
+ applicationId: APPLICATION_ID,
+ now,
+ records: [
+ {
+ timelineActivityTypeId: TYPE_ID,
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ workspaceMemberId: '00000000-0000-4000-8000-000000000011',
+ happensAt: '2026-08-24T12:00:00.000Z',
+ },
+ ],
+ resolvedTimelineActivityTypeById,
+ }),
+ ).toEqual([
+ {
+ timelineActivityTypeId: TYPE_ID,
+ timelineActivityTypeSnapshot: snapshot,
+ targetPersonId: '00000000-0000-4000-8000-000000000010',
+ workspaceMemberId: null,
+ happensAt: now.toISOString(),
+ },
+ ]);
+ });
+
+ it('rejects changing either immutable type field after creation', () => {
+ expect(() =>
+ assertTimelineActivityTypeIsNotUpdated([
+ { timelineActivityTypeSnapshot: snapshot },
+ ]),
+ ).toThrow('A timeline activity type is immutable after creation');
+ expect(() =>
+ assertTimelineActivityTypeIsNotUpdated([
+ { timelineActivityTypeId: TYPE_ID },
+ ]),
+ ).toThrow('A timeline activity type is immutable after creation');
+ expect(() =>
+ assertTimelineActivityTypeIsNotUpdated([{ properties: {} }]),
+ ).not.toThrow();
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/query-hooks/utils/timeline-activity-mutation-input.util.ts b/packages/twenty-server/src/modules/timeline/query-hooks/utils/timeline-activity-mutation-input.util.ts
new file mode 100644
index 00000000000..ffdec12047c
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/query-hooks/utils/timeline-activity-mutation-input.util.ts
@@ -0,0 +1,155 @@
+import { isDefined } from 'twenty-shared/utils';
+
+import { STANDARD_ERROR_MESSAGE } from 'src/engine/api/common/common-query-runners/errors/standard-error-message.constant';
+import {
+ GraphqlQueryRunnerException,
+ GraphqlQueryRunnerExceptionCode,
+} from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
+import { type TimelineActivityMutationInput } from 'src/modules/timeline/query-hooks/types/timeline-activity-mutation-input.type';
+import { type ResolvedTimelineActivityType } from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
+
+const throwInvalidTimelineActivityInput = (message: string): never => {
+ throw new GraphqlQueryRunnerException(
+ message,
+ GraphqlQueryRunnerExceptionCode.INVALID_QUERY_INPUT,
+ { userFriendlyMessage: STANDARD_ERROR_MESSAGE },
+ );
+};
+
+export const sanitizeApplicationTimelineActivityInput = ({
+ now = new Date(),
+ record,
+}: {
+ now?: Date;
+ record: TimelineActivityMutationInput;
+}): TimelineActivityMutationInput => {
+ const happensAt = isDefined(record.happensAt)
+ ? new Date(record.happensAt)
+ : undefined;
+
+ return {
+ ...record,
+ workspaceMemberId: null,
+ ...(isDefined(happensAt) &&
+ !Number.isNaN(happensAt.getTime()) &&
+ happensAt > now && { happensAt: now.toISOString() }),
+ };
+};
+
+export const assertTimelineActivityCreationInputIsValid = ({
+ records,
+ upsert,
+}: {
+ records: TimelineActivityMutationInput[];
+ upsert?: boolean;
+}): void => {
+ if (upsert) {
+ throwInvalidTimelineActivityInput(
+ 'Timeline activities cannot be upserted because their type is immutable',
+ );
+ }
+
+ if (
+ records.some(
+ ({ timelineActivityTypeId }) => !isDefined(timelineActivityTypeId),
+ )
+ ) {
+ throwInvalidTimelineActivityInput(
+ 'A timeline activity type is required on creation',
+ );
+ }
+
+ if (
+ records.some(
+ (record) =>
+ isDefined(record.linkedRecordId) !==
+ isDefined(record.linkedObjectMetadataId) ||
+ Object.entries(record).filter(
+ ([key, value]) => key.startsWith('target') && isDefined(value),
+ ).length !== 1,
+ )
+ ) {
+ throwInvalidTimelineActivityInput(
+ 'A timeline activity requires exactly one target and complete linked record metadata',
+ );
+ }
+};
+
+export const stampTimelineActivityTypeSnapshots = ({
+ applicationId,
+ now = new Date(),
+ records,
+ resolvedTimelineActivityTypeById,
+}: {
+ applicationId?: string;
+ now?: Date;
+ records: TimelineActivityMutationInput[];
+ resolvedTimelineActivityTypeById: ReadonlyMap<
+ string,
+ ResolvedTimelineActivityType
+ >;
+}): TimelineActivityMutationInput[] => {
+ if (
+ isDefined(applicationId) &&
+ [...resolvedTimelineActivityTypeById.values()].some(
+ (timelineActivityType) =>
+ timelineActivityType.applicationId !== applicationId,
+ )
+ ) {
+ throwInvalidTimelineActivityInput(
+ 'An application can only create its own timeline activity types',
+ );
+ }
+
+ return records.map((record) => {
+ if (!isDefined(record.timelineActivityTypeId)) {
+ return throwInvalidTimelineActivityInput(
+ 'Timeline activity type validation did not run',
+ );
+ }
+
+ const resolvedTimelineActivityType = resolvedTimelineActivityTypeById.get(
+ record.timelineActivityTypeId,
+ );
+
+ if (!isDefined(resolvedTimelineActivityType)) {
+ return throwInvalidTimelineActivityInput(
+ 'Timeline activity type resolution did not run',
+ );
+ }
+
+ const stampedRecord = {
+ ...record,
+ timelineActivityTypeSnapshot: resolvedTimelineActivityType.snapshot,
+ };
+
+ return isDefined(applicationId)
+ ? sanitizeApplicationTimelineActivityInput({
+ now,
+ record: stampedRecord,
+ })
+ : stampedRecord;
+ });
+};
+
+export const assertTimelineActivityTypeIsNotUpdated = (
+ records: TimelineActivityMutationInput[],
+): void => {
+ if (
+ records.some(
+ (record) =>
+ Object.prototype.hasOwnProperty.call(
+ record,
+ 'timelineActivityTypeId',
+ ) ||
+ Object.prototype.hasOwnProperty.call(
+ record,
+ 'timelineActivityTypeSnapshot',
+ ),
+ )
+ ) {
+ throwInvalidTimelineActivityInput(
+ 'A timeline activity type is immutable after creation',
+ );
+ }
+};
diff --git a/packages/twenty-server/src/modules/timeline/repositories/__tests__/timeline-activity.repository.spec.ts b/packages/twenty-server/src/modules/timeline/repositories/__tests__/timeline-activity.repository.spec.ts
new file mode 100644
index 00000000000..618e2260d72
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/repositories/__tests__/timeline-activity.repository.spec.ts
@@ -0,0 +1,81 @@
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
+
+import { type GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
+import { TimelineActivityRepository } from 'src/modules/timeline/repositories/timeline-activity.repository';
+
+const WORKSPACE_ID = '20202020-0000-4000-8000-000000000001';
+const RECORD_ID = '20202020-0000-4000-8000-000000000002';
+const WORKSPACE_MEMBER_ID = '20202020-0000-4000-8000-000000000003';
+const TIMELINE_ACTIVITY_TYPE_ID = '20202020-0000-4000-8000-000000000004';
+const TIMELINE_ACTIVITY_TYPE_SNAPSHOT: TimelineActivityTypeSnapshot = {
+ id: TIMELINE_ACTIVITY_TYPE_ID,
+ universalIdentifier: '20202020-0000-4000-8000-000000000005',
+ name: 'recordUpdated',
+ label: 'was updated by',
+ action: 'updated',
+ icon: 'IconPencil',
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+};
+
+describe('TimelineActivityRepository', () => {
+ it('merges and stamps a recent row written without a snapshot', async () => {
+ const update = jest.fn().mockResolvedValue(undefined);
+ const insert = jest.fn().mockResolvedValue(undefined);
+ const workspaceRepository = {
+ find: jest.fn().mockResolvedValue([
+ {
+ id: '20202020-0000-4000-8000-000000000006',
+ targetPersonId: RECORD_ID,
+ workspaceMemberId: WORKSPACE_MEMBER_ID,
+ timelineActivityTypeId: TIMELINE_ACTIVITY_TYPE_ID,
+ timelineActivityTypeSnapshot: null,
+ linkedRecordId: null,
+ properties: {
+ diff: { name: { before: 'Before', after: 'First' } },
+ },
+ },
+ ]),
+ update,
+ insert,
+ };
+ const globalWorkspaceOrmManager = {
+ executeInWorkspaceContext: jest.fn(
+ async (callback: () => Promise<void>) => callback(),
+ ),
+ getRepository: jest.fn().mockResolvedValue(workspaceRepository),
+ } as unknown as GlobalWorkspaceOrmManager;
+ const repository = new TimelineActivityRepository(
+ globalWorkspaceOrmManager,
+ );
+
+ await repository.upsertTimelineActivities({
+ objectSingularName: 'person',
+ workspaceId: WORKSPACE_ID,
+ payloads: [
+ {
+ happensAt: new Date('2026-08-23T09:00:00.000Z'),
+ properties: {
+ diff: { name: { before: 'First', after: 'Second' } },
+ },
+ recordId: RECORD_ID,
+ workspaceMemberId: WORKSPACE_MEMBER_ID,
+ timelineActivityTypeId: TIMELINE_ACTIVITY_TYPE_ID,
+ timelineActivityTypeSnapshot: TIMELINE_ACTIVITY_TYPE_SNAPSHOT,
+ },
+ ],
+ });
+
+ expect(insert).not.toHaveBeenCalled();
+ expect(update).toHaveBeenCalledWith(
+ '20202020-0000-4000-8000-000000000006',
+ {
+ properties: {
+ diff: { name: { before: 'Before', after: 'Second' } },
+ },
+ workspaceMemberId: WORKSPACE_MEMBER_ID,
+ timelineActivityTypeSnapshot: TIMELINE_ACTIVITY_TYPE_SNAPSHOT,
+ },
+ );
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
index d3b63e47395..4893a99c469 100644
--- a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
+++ b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
@@ -8,20 +8,12 @@ import { objectRecordDiffMerge } from 'src/engine/core-modules/event-emitter/uti
import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { type TimelineActivityPayload } from 'src/modules/timeline/types/timeline-activity-payload';
+import {
+ buildTimelineActivityMergeKey,
+ buildTimelineActivityMergeKeyCandidates,
+} from 'src/modules/timeline/utils/build-timeline-activity-merge-key.util';
import { buildTimelineActivityRelatedMorphFieldMetadataName } from 'src/modules/timeline/utils/timeline-activity-related-morph-field-metadata-name-builder.util';
-// An unset author is null on a stored row and undefined on a payload, so both
-// are normalized before they can decide whether two events are the same.
-const buildMergeKey = ({
- recordId,
- workspaceMemberId,
- discriminator,
-}: {
- recordId: string;
- workspaceMemberId: string | null | undefined;
- discriminator: string;
-}): string => `${recordId}|${workspaceMemberId ?? null}|${discriminator}`;
-
type TimelineActivityPayloadWorkspaceIdAndObjectSingularName = {
payloads: (Omit<TimelineActivityPayload, 'properties'> & {
properties: Pick<TimelineActivityPayload['properties'], 'diff'>;
@@ -56,7 +48,7 @@ export class TimelineActivityRepository {
id: string;
properties: Partial<ObjectRecord>;
workspaceMemberId: string | undefined;
- timelineActivityTypeId: string;
+ timelineActivityTypeSnapshot?: TimelineActivityPayload['timelineActivityTypeSnapshot'];
}[] = [];
const timelineActivityPropertyName =
@@ -70,54 +62,39 @@ export class TimelineActivityRepository {
>();
for (const timelineActivity of recentTimelineActivities) {
- const discriminators = [
- isDefined(timelineActivity.timelineActivityTypeId)
- ? `type:${timelineActivity.timelineActivityTypeId}`
- : undefined,
- isDefined(timelineActivity.name)
- ? `name:${timelineActivity.name}`
- : undefined,
- ].filter(isDefined);
-
- for (const discriminator of discriminators) {
- const mergeKey = buildMergeKey({
- recordId: timelineActivity[timelineActivityPropertyName],
- workspaceMemberId: timelineActivity.workspaceMemberId,
- discriminator,
- });
+ const mergeKey = buildTimelineActivityMergeKey({
+ recordId: timelineActivity[timelineActivityPropertyName],
+ workspaceMemberId: timelineActivity.workspaceMemberId,
+ timelineActivityTypeId: timelineActivity.timelineActivityTypeId,
+ timelineActivityTypeSnapshot:
+ timelineActivity.timelineActivityTypeSnapshot,
+ });
- const bucket = recentTimelineActivitiesByMergeKey.get(mergeKey);
+ const bucket = recentTimelineActivitiesByMergeKey.get(mergeKey);
- if (isDefined(bucket)) {
- bucket.push(timelineActivity);
- } else {
- recentTimelineActivitiesByMergeKey.set(mergeKey, [
- timelineActivity,
- ]);
- }
+ if (isDefined(bucket)) {
+ bucket.push(timelineActivity);
+ } else {
+ recentTimelineActivitiesByMergeKey.set(mergeKey, [timelineActivity]);
}
}
for (const payload of payloads) {
- const typeMergeKey = buildMergeKey({
- recordId: payload.recordId,
- workspaceMemberId: payload.workspaceMemberId,
- discriminator: `type:${payload.timelineActivityTypeId}`,
- });
- const nameMergeKey = buildMergeKey({
+ const recentTimelineActivity = buildTimelineActivityMergeKeyCandidates({
recordId: payload.recordId,
workspaceMemberId: payload.workspaceMemberId,
- discriminator: `name:${payload.name}`,
- });
-
- const recentTimelineActivity = [
- ...(recentTimelineActivitiesByMergeKey.get(typeMergeKey) ?? []),
- ...(recentTimelineActivitiesByMergeKey.get(nameMergeKey) ?? []),
- ].find(
- (timelineActivity) =>
- !isDefined(payload.linkedRecordId) ||
- timelineActivity.linkedRecordId === payload.linkedRecordId,
- );
+ timelineActivityTypeId: payload.timelineActivityTypeId,
+ timelineActivityTypeSnapshot: payload.timelineActivityTypeSnapshot,
+ })
+ .flatMap(
+ (mergeKey) =>
+ recentTimelineActivitiesByMergeKey.get(mergeKey) ?? [],
+ )
+ .find(
+ (timelineActivity) =>
+ !isDefined(payload.linkedRecordId) ||
+ timelineActivity.linkedRecordId === payload.linkedRecordId,
+ );
if (isDefined(recentTimelineActivity)) {
mergesToApply.push({
@@ -127,7 +104,12 @@ export class TimelineActivityRepository {
payload.properties,
),
workspaceMemberId: payload.workspaceMemberId,
- timelineActivityTypeId: payload.timelineActivityTypeId,
+ ...(!isDefined(
+ recentTimelineActivity.timelineActivityTypeSnapshot,
+ ) && {
+ timelineActivityTypeSnapshot:
+ payload.timelineActivityTypeSnapshot,
+ }),
});
} else {
payloadsToInsert.push(payload);
@@ -178,18 +160,12 @@ export class TimelineActivityRepository {
// window, so every candidate is fetched: taking a single row would let only
// one payload of a multi record batch merge.
return await timelineActivityTypeORMRepository.find({
- where: [
- {
- ...whereConditions,
- timelineActivityTypeId: In(
- payloads.map((payload) => payload.timelineActivityTypeId),
- ),
- },
- {
- ...whereConditions,
- name: In(payloads.map((payload) => payload.name)),
- },
- ],
+ where: {
+ ...whereConditions,
+ timelineActivityTypeId: In(
+ payloads.map((payload) => payload.timelineActivityTypeId),
+ ),
+ },
order: { createdAt: 'DESC' },
});
}
@@ -217,8 +193,9 @@ export class TimelineActivityRepository {
return timelineActivityTypeORMRepository.insert(
payloads.map((payload) => ({
- name: payload.name,
+ happensAt: payload.happensAt,
timelineActivityTypeId: payload.timelineActivityTypeId,
+ timelineActivityTypeSnapshot: payload.timelineActivityTypeSnapshot,
properties: payload.properties,
workspaceMemberId: payload.workspaceMemberId,
[timelineActivityPropertyName]: payload.recordId,
@@ -237,7 +214,7 @@ export class TimelineActivityRepository {
id: string;
properties: Partial<ObjectRecord>;
workspaceMemberId: string | undefined;
- timelineActivityTypeId: string;
+ timelineActivityTypeSnapshot?: TimelineActivityPayload['timelineActivityTypeSnapshot'];
}[];
workspaceId: string;
}) {
@@ -256,11 +233,13 @@ export class TimelineActivityRepository {
await Promise.all(
merges.map(
- ({ id, properties, workspaceMemberId, timelineActivityTypeId }) =>
+ ({ id, properties, workspaceMemberId, timelineActivityTypeSnapshot }) =>
timelineActivityTypeORMRepository.update(id, {
properties,
workspaceMemberId,
- timelineActivityTypeId,
+ ...(isDefined(timelineActivityTypeSnapshot) && {
+ timelineActivityTypeSnapshot,
+ }),
}),
),
);
diff --git a/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-event-eligibility.service.spec.ts b/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-event-eligibility.service.spec.ts
new file mode 100644
index 00000000000..a6a50c6e0bc
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-event-eligibility.service.spec.ts
@@ -0,0 +1,128 @@
+import { TimelineActivityEventEligibilityService } from 'src/modules/timeline/services/timeline-activity-event-eligibility.service';
+
+const SOURCE_OBJECT_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000001';
+const JUNCTION_OBJECT_ID = '00000000-0000-4000-8000-000000000002';
+const RELATION_FIELD_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000003';
+
+const buildService = ({
+ objectUniversalIdentifier,
+ relationTargetObjectMetadataId,
+}: {
+ objectUniversalIdentifier: string;
+ relationTargetObjectMetadataId?: string;
+}) => {
+ const getOrRecomputeManyOrAllFlatEntityMapsWithHashes = jest
+ .fn()
+ .mockResolvedValue({
+ data: {
+ flatFieldMetadataMaps: {
+ byUniversalIdentifier: {
+ [RELATION_FIELD_UNIVERSAL_IDENTIFIER]: {
+ relationTargetObjectMetadataId,
+ },
+ },
+ },
+ flatObjectMetadataMaps: {
+ byUniversalIdentifier: {
+ [SOURCE_OBJECT_UNIVERSAL_IDENTIFIER]: {
+ id: 'source-object-id',
+ },
+ },
+ },
+ flatTimelineActivityTypeMaps: {
+ byUniversalIdentifier: {
+ type: {
+ action: 'linked',
+ applicationUniversalIdentifier:
+ '00000000-0000-4000-8000-000000000004',
+ isActive: true,
+ objectUniversalIdentifier,
+ targetRelationFieldUniversalIdentifier:
+ RELATION_FIELD_UNIVERSAL_IDENTIFIER,
+ triggerFieldUniversalIdentifiers: null,
+ universalIdentifier: '00000000-0000-4000-8000-000000000005',
+ },
+ },
+ },
+ },
+ hashes: {
+ flatFieldMetadataMaps: 'field-hash',
+ flatObjectMetadataMaps: 'object-hash',
+ flatTimelineActivityTypeMaps: 'type-hash',
+ },
+ });
+
+ return {
+ getOrRecomputeManyOrAllFlatEntityMapsWithHashes,
+ service: new TimelineActivityEventEligibilityService({
+ getOrRecomputeManyOrAllFlatEntityMapsWithHashes,
+ } as never),
+ };
+};
+
+describe('TimelineActivityEventEligibilityService', () => {
+ it('keeps audit-logged objects on the timeline write path', async () => {
+ const { getOrRecomputeManyOrAllFlatEntityMapsWithHashes, service } =
+ buildService({
+ objectUniversalIdentifier: SOURCE_OBJECT_UNIVERSAL_IDENTIFIER,
+ });
+
+ await expect(
+ service.shouldProcessEvent({
+ flatObjectMetadata: { isAuditLogged: true } as never,
+ workspaceId: 'workspace-id',
+ }),
+ ).resolves.toBe(true);
+ expect(
+ getOrRecomputeManyOrAllFlatEntityMapsWithHashes,
+ ).not.toHaveBeenCalled();
+ });
+
+ it('keeps non-audited declared source and junction objects', async () => {
+ const { service } = buildService({
+ objectUniversalIdentifier: SOURCE_OBJECT_UNIVERSAL_IDENTIFIER,
+ relationTargetObjectMetadataId: JUNCTION_OBJECT_ID,
+ });
+
+ await expect(
+ service.shouldProcessEvent({
+ flatObjectMetadata: {
+ id: 'source-object-id',
+ isAuditLogged: false,
+ universalIdentifier: SOURCE_OBJECT_UNIVERSAL_IDENTIFIER,
+ } as never,
+ workspaceId: 'workspace-id',
+ }),
+ ).resolves.toBe(true);
+ await expect(
+ service.shouldProcessEvent({
+ flatObjectMetadata: {
+ id: JUNCTION_OBJECT_ID,
+ isAuditLogged: false,
+ universalIdentifier: 'junction-object-universal-identifier',
+ } as never,
+ workspaceId: 'workspace-id',
+ }),
+ ).resolves.toBe(true);
+ });
+
+ it('drops unrelated non-audited hot-path objects before enqueueing', async () => {
+ const { service } = buildService({
+ objectUniversalIdentifier: SOURCE_OBJECT_UNIVERSAL_IDENTIFIER,
+ relationTargetObjectMetadataId: JUNCTION_OBJECT_ID,
+ });
+
+ await expect(
+ service.shouldProcessEvent({
+ flatObjectMetadata: {
+ id: 'unrelated-object-id',
+ isAuditLogged: false,
+ universalIdentifier: 'unrelated-object-universal-identifier',
+ } as never,
+ workspaceId: 'workspace-id',
+ }),
+ ).resolves.toBe(false);
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-metadata-diagnostics.service.spec.ts b/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-metadata-diagnostics.service.spec.ts
new file mode 100644
index 00000000000..cb2dbdf6266
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/services/__tests__/timeline-activity-metadata-diagnostics.service.spec.ts
@@ -0,0 +1,28 @@
+import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';
+
+describe('TimelineActivityMetadataDiagnosticsService', () => {
+ it('rate-limits repeated metadata diagnostics from event batches', () => {
+ const incrementCounterBy = jest.fn();
+ const service = new TimelineActivityMetadataDiagnosticsService({
+ incrementCounterBy,
+ } as never);
+ const now = jest.spyOn(Date, 'now').mockReturnValue(1_000_000);
+ const issue = {
+ action: 'linked',
+ objectUniversalIdentifier: '00000000-0000-4000-8000-000000000001',
+ reason: 'invalid-contract' as const,
+ workspaceId: '00000000-0000-4000-8000-000000000002',
+ };
+
+ service.report(issue);
+ service.report(issue);
+
+ expect(incrementCounterBy).toHaveBeenCalledTimes(1);
+
+ now.mockReturnValue(1_300_000);
+ service.report(issue);
+
+ expect(incrementCounterBy).toHaveBeenCalledTimes(2);
+ now.mockRestore();
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-event-eligibility.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-event-eligibility.service.ts
new file mode 100644
index 00000000000..10bf3e39c40
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-event-eligibility.service.ts
@@ -0,0 +1,107 @@
+import { Injectable } from '@nestjs/common';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { findFlatEntityByUniversalIdentifier } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier.util';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { resolveTimelineActivityTypeRouting } from 'src/modules/timeline/utils/resolve-timeline-activity-type-routing.util';
+
+@Injectable()
+export class TimelineActivityEventEligibilityService {
+ private readonly eligibleNonAuditedObjectIdsByWorkspaceId = new Map<
+ string,
+ { cacheKey: string; objectIds: Set<string> }
+ >();
+
+ constructor(
+ private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
+ ) {}
+
+ async shouldProcessEvent({
+ flatObjectMetadata,
+ workspaceId,
+ }: {
+ flatObjectMetadata: FlatObjectMetadata;
+ workspaceId: string;
+ }): Promise<boolean> {
+ if (flatObjectMetadata.isAuditLogged) {
+ return true;
+ }
+
+ const { data, hashes } =
+ await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMapsWithHashes(
+ {
+ workspaceId,
+ flatMapsKeys: [
+ 'flatFieldMetadataMaps',
+ 'flatObjectMetadataMaps',
+ 'flatTimelineActivityTypeMaps',
+ ],
+ },
+ );
+ const cacheKey = [
+ hashes.flatFieldMetadataMaps,
+ hashes.flatObjectMetadataMaps,
+ hashes.flatTimelineActivityTypeMaps,
+ ].join('|');
+ const cachedEligibility =
+ this.eligibleNonAuditedObjectIdsByWorkspaceId.get(workspaceId);
+
+ if (cachedEligibility?.cacheKey === cacheKey) {
+ return cachedEligibility.objectIds.has(flatObjectMetadata.id);
+ }
+
+ const eligibleObjectIds = new Set<string>();
+ const {
+ flatFieldMetadataMaps,
+ flatObjectMetadataMaps,
+ flatTimelineActivityTypeMaps,
+ } = data;
+
+ for (const timelineActivityType of Object.values(
+ flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ )
+ .filter(isDefined)
+ .filter(
+ (timelineActivityType) =>
+ timelineActivityType.isActive &&
+ isDefined(timelineActivityType.action),
+ )) {
+ if (isDefined(timelineActivityType.objectUniversalIdentifier)) {
+ const sourceObjectMetadata = findFlatEntityByUniversalIdentifier({
+ flatEntityMaps: flatObjectMetadataMaps,
+ universalIdentifier: timelineActivityType.objectUniversalIdentifier,
+ });
+
+ if (isDefined(sourceObjectMetadata)) {
+ eligibleObjectIds.add(sourceObjectMetadata.id);
+ }
+ }
+
+ const routing = resolveTimelineActivityTypeRouting(timelineActivityType);
+
+ if (!isDefined(routing)) {
+ continue;
+ }
+
+ const relationFieldMetadata = findFlatEntityByUniversalIdentifier({
+ flatEntityMaps: flatFieldMetadataMaps,
+ universalIdentifier: routing.targetRelationFieldUniversalIdentifier,
+ });
+
+ if (isDefined(relationFieldMetadata?.relationTargetObjectMetadataId)) {
+ eligibleObjectIds.add(
+ relationFieldMetadata.relationTargetObjectMetadataId,
+ );
+ }
+ }
+
+ this.eligibleNonAuditedObjectIdsByWorkspaceId.set(workspaceId, {
+ cacheKey,
+ objectIds: eligibleObjectIds,
+ });
+
+ return eligibleObjectIds.has(flatObjectMetadata.id);
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-metadata-diagnostics.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-metadata-diagnostics.service.ts
new file mode 100644
index 00000000000..dc9370a74ca
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-metadata-diagnostics.service.ts
@@ -0,0 +1,74 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { isDefined } from 'twenty-shared/utils';
+
+import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';
+import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';
+
+type TimelineActivityMetadataIssue = {
+ workspaceId: string;
+ reason:
+ | 'ambiguous-declared-rule'
+ | 'ambiguous-resolver'
+ | 'invalid-contract'
+ | 'missing-type';
+ action: string;
+ objectUniversalIdentifier: string | null;
+};
+
+type TimelineActivityMetadataIssueDetails = Pick<
+ TimelineActivityMetadataIssue,
+ 'action' | 'objectUniversalIdentifier'
+>;
+
+const DIAGNOSTIC_REPORT_INTERVAL_MS = 5 * 60 * 1000;
+
+@Injectable()
+export class TimelineActivityMetadataDiagnosticsService {
+ private readonly logger = new Logger(
+ TimelineActivityMetadataDiagnosticsService.name,
+ );
+ private readonly lastReportedAtByIssueKey = new Map<string, number>();
+
+ constructor(private readonly metricsService: MetricsService) {}
+
+ reportAll({
+ workspaceId,
+ reason,
+ issues,
+ }: Pick<TimelineActivityMetadataIssue, 'workspaceId' | 'reason'> & {
+ issues: TimelineActivityMetadataIssueDetails[];
+ }): void {
+ for (const issue of issues) {
+ this.report({ workspaceId, reason, ...issue });
+ }
+ }
+
+ report(issue: TimelineActivityMetadataIssue): void {
+ const issueKey = [
+ issue.workspaceId,
+ issue.reason,
+ issue.action,
+ issue.objectUniversalIdentifier,
+ ].join('|');
+ const now = Date.now();
+ const lastReportedAt = this.lastReportedAtByIssueKey.get(issueKey);
+
+ if (
+ isDefined(lastReportedAt) &&
+ now - lastReportedAt < DIAGNOSTIC_REPORT_INTERVAL_MS
+ ) {
+ return;
+ }
+
+ this.lastReportedAtByIssueKey.set(issueKey, now);
+ this.logger.warn(
+ `Skipping timeline activity metadata: ${JSON.stringify(issue)}`,
+ );
+ this.metricsService.incrementCounterBy({
+ key: MetricsKeys.TimelineActivityMetadataIssue,
+ amount: 1,
+ attributes: { reason: issue.reason },
+ });
+ }
+}
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-rule-builder.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-rule-builder.service.ts
index 0738cd80e40..85bfae39cee 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-rule-builder.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-rule-builder.service.ts
@@ -7,30 +7,29 @@ import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/typ
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 { STANDARD_TIMELINE_ACTIVITY_RULES } from 'src/modules/timeline/constants/standard-timeline-activity-rules.constant';
-import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';
-import { type TimelineActivityTypeResolver } from 'src/modules/timeline/utils/resolve-timeline-activity-type-id.util';
+import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';
+import {
+ buildTimelineActivityTypeResolution,
+ toResolvedTimelineActivityType,
+ type TimelineActivityTypeResolver,
+} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';
import { buildJunctionTargetShape } from 'src/modules/timeline/utils/build-junction-target-shape.util';
-import { deriveDefaultTimelineActivityRule } from 'src/modules/timeline/utils/derive-default-timeline-activity-rule.util';
+import { buildTimelineActivitySelfRule } from 'src/modules/timeline/utils/build-timeline-activity-self-rule.util';
+import { resolveTimelineActivityTypeRouting } from 'src/modules/timeline/utils/resolve-timeline-activity-type-routing.util';
type TimelineActivityRulesForEventBatch = {
- // Rules triggered by events on the batch object itself
sourceRules: TimelineActivityRule[];
- // Rules whose junction object is the batch object, so events on it are link
- // or unlink events for the rule
junctionRules: TimelineActivityRule[];
- // Returned so callers reading field metadata do not fetch the cache again
flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
- // Picks the timeline activity type stamped on the rows a rule produces
- resolveTimelineActivityTypeId: TimelineActivityTypeResolver;
+ resolveTimelineActivityType: TimelineActivityTypeResolver;
};
@Injectable()
export class TimelineActivityRuleBuilderService {
constructor(
private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
- private readonly timelineActivityTypeCacheService: TimelineActivityTypeCacheService,
+ private readonly timelineActivityMetadataDiagnosticsService: TimelineActivityMetadataDiagnosticsService,
) {}
async getRulesForEventBatch({
@@ -40,69 +39,89 @@ export class TimelineActivityRuleBuilderService {
workspaceId: string;
flatObjectMetadata: FlatObjectMetadata;
}): Promise<TimelineActivityRulesForEventBatch> {
- const { flatObjectMetadataMaps, flatFieldMetadataMaps } =
+ const {
+ flatObjectMetadataMaps,
+ flatFieldMetadataMaps,
+ flatTimelineActivityTypeMaps,
+ } =
await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
{
workspaceId,
- flatMapsKeys: ['flatObjectMetadataMaps', 'flatFieldMetadataMaps'],
+ flatMapsKeys: [
+ 'flatObjectMetadataMaps',
+ 'flatFieldMetadataMaps',
+ 'flatTimelineActivityTypeMaps',
+ ],
},
);
- const standardRules = this.buildStandardRules({
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
+ const {
+ effectiveTimelineActivityTypes,
+ routingConflicts,
+ resolverConflicts,
+ invalidContracts,
+ resolveTimelineActivityType,
+ } = buildTimelineActivityTypeResolution({
+ ...flatTimelineActivityTypeMaps,
+ objectMetadataByUniversalIdentifier:
+ flatObjectMetadataMaps.byUniversalIdentifier,
});
- const derivedSelfRule =
- deriveDefaultTimelineActivityRule(flatObjectMetadata);
-
- const sourceRules = [
- ...(isDefined(derivedSelfRule) ? [derivedSelfRule] : []),
- ...standardRules.filter(
- (rule) => rule.sourceFlatObjectMetadata.id === flatObjectMetadata.id,
- ),
- ];
+ this.timelineActivityMetadataDiagnosticsService.reportAll({
+ workspaceId,
+ reason: 'ambiguous-declared-rule',
+ issues: routingConflicts,
+ });
+ this.timelineActivityMetadataDiagnosticsService.reportAll({
+ workspaceId,
+ reason: 'ambiguous-resolver',
+ issues: resolverConflicts,
+ });
+ this.timelineActivityMetadataDiagnosticsService.reportAll({
+ workspaceId,
+ reason: 'invalid-contract',
+ issues: invalidContracts,
+ });
- const junctionRules = standardRules.filter(
- (rule) =>
- rule.targetShape.kind === 'JUNCTION' &&
- rule.targetShape.junctionObjectMetadataId === flatObjectMetadata.id,
+ const activeTimelineActivityTypes = effectiveTimelineActivityTypes.filter(
+ (timelineActivityType) => timelineActivityType.isActive,
);
- return {
- sourceRules,
- junctionRules,
- flatFieldMetadataMaps,
- resolveTimelineActivityTypeId:
- await this.timelineActivityTypeCacheService.getTimelineActivityTypeResolver(
- workspaceId,
- ),
- };
- }
+ const invalidThroughRules: {
+ action: string;
+ objectUniversalIdentifier: string | null;
+ }[] = [];
+ const declaredThroughRules = activeTimelineActivityTypes
+ .map((timelineActivityType): TimelineActivityRule | undefined => {
+ const routing =
+ resolveTimelineActivityTypeRouting(timelineActivityType);
+
+ if (
+ !isDefined(timelineActivityType.action) ||
+ !isDefined(timelineActivityType.objectUniversalIdentifier) ||
+ !isDefined(routing)
+ ) {
+ return undefined;
+ }
- private buildStandardRules({
- flatObjectMetadataMaps,
- flatFieldMetadataMaps,
- }: {
- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
- }): TimelineActivityRule[] {
- return STANDARD_TIMELINE_ACTIVITY_RULES.map(
- (standardRule): TimelineActivityRule | undefined => {
const sourceFlatObjectMetadata = findFlatEntityByUniversalIdentifier({
flatEntityMaps: flatObjectMetadataMaps,
- universalIdentifier: standardRule.objectUniversalIdentifier,
+ universalIdentifier: timelineActivityType.objectUniversalIdentifier,
});
-
const relationFlatFieldMetadata = findFlatEntityByUniversalIdentifier({
flatEntityMaps: flatFieldMetadataMaps,
- universalIdentifier: standardRule.relationFieldUniversalIdentifier,
+ universalIdentifier: routing.targetRelationFieldUniversalIdentifier,
});
if (
!isDefined(sourceFlatObjectMetadata) ||
!isDefined(relationFlatFieldMetadata)
) {
+ invalidThroughRules.push({
+ action: timelineActivityType.action,
+ objectUniversalIdentifier:
+ timelineActivityType.objectUniversalIdentifier,
+ });
return undefined;
}
@@ -113,14 +132,21 @@ export class TimelineActivityRuleBuilderService {
});
if (!isDefined(targetShape)) {
+ invalidThroughRules.push({
+ action: timelineActivityType.action,
+ objectUniversalIdentifier:
+ timelineActivityType.objectUniversalIdentifier,
+ });
return undefined;
}
return {
sourceFlatObjectMetadata,
- actions: standardRule.actions,
+ actions: [timelineActivityType.action],
+ timelineActivityType:
+ toResolvedTimelineActivityType(timelineActivityType),
triggerFieldNames:
- standardRule.triggerFieldUniversalIdentifiers
+ routing.triggerFieldUniversalIdentifiers
?.map(
(universalIdentifier) =>
findFlatEntityByUniversalIdentifier({
@@ -131,7 +157,38 @@ export class TimelineActivityRuleBuilderService {
.filter(isDefined) ?? null,
targetShape,
};
- },
- ).filter(isDefined);
+ })
+ .filter(isDefined);
+
+ this.timelineActivityMetadataDiagnosticsService.reportAll({
+ workspaceId,
+ reason: 'invalid-contract',
+ issues: invalidThroughRules,
+ });
+
+ const selfRule = buildTimelineActivitySelfRule({
+ flatObjectMetadata,
+ timelineActivityTypes: activeTimelineActivityTypes,
+ });
+
+ const sourceRules = [
+ ...(isDefined(selfRule) ? [selfRule] : []),
+ ...declaredThroughRules.filter(
+ (rule) => rule.sourceFlatObjectMetadata.id === flatObjectMetadata.id,
+ ),
+ ];
+
+ const junctionRules = declaredThroughRules.filter(
+ (rule) =>
+ rule.targetShape.kind === 'JUNCTION' &&
+ rule.targetShape.junctionObjectMetadataId === flatObjectMetadata.id,
+ );
+
+ return {
+ sourceRules,
+ junctionRules,
+ flatFieldMetadataMaps,
+ resolveTimelineActivityType,
+ };
}
}
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
index f41592b9e0b..7dddb08ffdb 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-target-query.service.ts
@@ -34,8 +34,6 @@ export class TimelineActivityTargetQueryService {
private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
) {}
- // Source events: walk the junction in one batched query and return, per source
- // record, every record whose timeline receives an entry.
async resolveTargetsBySourceRecordId({
rule,
sourceRecordIds,
@@ -88,7 +86,6 @@ export class TimelineActivityTargetQueryService {
return targetsBySourceRecordId;
}
- // Link events: the junction row is the event payload, no query needed.
resolveTargetFromJunctionRecord({
rule,
junctionRecord,
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts
index 15db02e1c74..651ed9e780c 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity-type-cache.service.ts
@@ -1,25 +1,83 @@
import { Injectable } from '@nestjs/common';
+import { isDefined } from 'twenty-shared/utils';
+
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { TimelineException } from 'src/modules/timeline/exceptions/timeline.exception';
+import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';
import {
- buildTimelineActivityTypeResolver,
+ buildTimelineActivityTypeResolution,
+ toResolvedTimelineActivityType,
+ type ResolvedTimelineActivityType,
type TimelineActivityTypeResolver,
-} from 'src/modules/timeline/utils/resolve-timeline-activity-type-id.util';
+} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
@Injectable()
export class TimelineActivityTypeCacheService {
constructor(
private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
+ private readonly timelineActivityMetadataDiagnosticsService: TimelineActivityMetadataDiagnosticsService,
) {}
async getTimelineActivityTypeResolver(
workspaceId: string,
): Promise<TimelineActivityTypeResolver> {
+ const { flatTimelineActivityTypeMaps, flatObjectMetadataMaps } =
+ await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+ {
+ workspaceId,
+ flatMapsKeys: [
+ 'flatTimelineActivityTypeMaps',
+ 'flatObjectMetadataMaps',
+ ],
+ },
+ );
+
+ const { resolveTimelineActivityType, resolverConflicts, invalidContracts } =
+ buildTimelineActivityTypeResolution({
+ ...flatTimelineActivityTypeMaps,
+ objectMetadataByUniversalIdentifier:
+ flatObjectMetadataMaps.byUniversalIdentifier,
+ });
+
+ this.timelineActivityMetadataDiagnosticsService.reportAll({
+ workspaceId,
+ reason: 'ambiguous-resolver',
+ issues: resolverConflicts,
+ });
+ this.timelineActivityMetadataDiagnosticsService.reportAll({
+ workspaceId,
+ reason: 'invalid-contract',
+ issues: invalidContracts,
+ });
+
+ return resolveTimelineActivityType;
+ }
+
+ async getTimelineActivityTypeByIdOrThrow({
+ workspaceId,
+ timelineActivityTypeId,
+ }: {
+ workspaceId: string;
+ timelineActivityTypeId: string;
+ }): Promise<ResolvedTimelineActivityType> {
const { flatTimelineActivityTypeMaps } =
await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
{ workspaceId, flatMapsKeys: ['flatTimelineActivityTypeMaps'] },
);
- return buildTimelineActivityTypeResolver(flatTimelineActivityTypeMaps);
+ const timelineActivityType = findFlatEntityByIdInFlatEntityMaps({
+ flatEntityId: timelineActivityTypeId,
+ flatEntityMaps: flatTimelineActivityTypeMaps,
+ });
+
+ if (!isDefined(timelineActivityType) || !timelineActivityType.isActive) {
+ throw new TimelineException(
+ `Active timeline activity type ${timelineActivityTypeId} was not found in workspace ${workspaceId}`,
+ );
+ }
+
+ return toResolvedTimelineActivityType(timelineActivityType);
}
}
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.ts
index 4020c5669b7..101a0486de6 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
@@ -1,4 +1,4 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';
import { FieldMetadataType, type ObjectRecord } from 'twenty-shared/types';
@@ -18,7 +18,10 @@ import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/wo
import { parseEventNameOrThrow } from 'src/engine/workspace-event-emitter/utils/parse-event-name';
import { TimelineActivityRepository } from 'src/modules/timeline/repositories/timeline-activity.repository';
import { TimelineActivityRuleBuilderService } from 'src/modules/timeline/services/timeline-activity-rule-builder.service';
-import { type TimelineActivityTypeResolver } from 'src/modules/timeline/utils/resolve-timeline-activity-type-id.util';
+import {
+ type ResolvedTimelineActivityType,
+ type TimelineActivityTypeResolver,
+} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
import { TimelineActivityTargetQueryService } from 'src/modules/timeline/services/timeline-activity-target-query.service';
import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
import { type ResolvedTimelineActivityTarget } from 'src/modules/timeline/types/resolved-timeline-activity-target.type';
@@ -26,10 +29,13 @@ import { type TimelineActivityPayload } from 'src/modules/timeline/types/timelin
import { type TimelineActivityRuleAction } from 'src/modules/timeline/types/timeline-activity-rule-action.type';
import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';
import { resolveLinkedRecordCachedName } from 'src/modules/timeline/utils/resolve-linked-record-cached-name.util';
+import { resolveTimelineActivityHappensAt } from 'src/modules/timeline/utils/resolve-timeline-activity-happens-at.util';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';
+import { doesTimelineActivityJunctionLinkChange } from 'src/modules/timeline/utils/does-timeline-activity-junction-link-change.util';
// An event on the junction object is a change to the link, not to the linked
-// record. `updated` covers a junction row being repointed at another target.
+// record. `updated` is filtered to join-column changes below.
const JUNCTION_EVENT_ACTIONS: Partial<
Record<DatabaseEventAction, TimelineActivityRuleAction>
> = {
@@ -48,6 +54,15 @@ const SOURCE_EVENT_ACTIONS: Partial<
restored: 'restored',
};
+type BuildPayloadsForRuleArgs = {
+ rule: TimelineActivityRule;
+ events: ObjectRecordBaseEvent[];
+ action: DatabaseEventAction;
+ workspaceId: string;
+ flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ resolveTimelineActivityType: TimelineActivityTypeResolver;
+};
+
// Only the diff is worth storing: the rest of an event payload is the record
// itself, which the timeline reads live.
const keepDiffOnly = (
@@ -58,29 +73,28 @@ const keepDiffOnly = (
return isDefined(diff) && Object.keys(diff).length > 0 ? { diff } : {};
};
-// Both event streams write the same row shape; only the linked record, its
-// cached name and the persisted properties differ.
const buildLinkedPayload = ({
rule,
- name,
- timelineActivityTypeId,
+ timelineActivityType,
target,
workspaceMemberId,
linkedRecordId,
linkedRecordCachedName,
+ happensAt,
properties,
}: {
rule: TimelineActivityRule;
- name: string;
- timelineActivityTypeId: string;
+ timelineActivityType: ResolvedTimelineActivityType;
target: ResolvedTimelineActivityTarget;
workspaceMemberId: string | undefined;
linkedRecordId: string;
linkedRecordCachedName: string | undefined;
+ happensAt: Date;
properties: ObjectRecordBaseEvent['properties'];
}): TimelineActivityPayload => ({
- name,
- timelineActivityTypeId,
+ happensAt,
+ timelineActivityTypeId: timelineActivityType.id,
+ timelineActivityTypeSnapshot: timelineActivityType.snapshot,
objectSingularName: target.targetObjectNameSingular,
recordId: target.targetRecordId,
workspaceMemberId,
@@ -92,14 +106,13 @@ const buildLinkedPayload = ({
@Injectable()
export class TimelineActivityService {
- private readonly logger = new Logger(TimelineActivityService.name);
-
constructor(
@InjectObjectMetadataRepository(TimelineActivityWorkspaceEntity)
private readonly timelineActivityRepository: TimelineActivityRepository,
private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
private readonly timelineActivityRuleBuilderService: TimelineActivityRuleBuilderService,
private readonly timelineActivityTargetQueryService: TimelineActivityTargetQueryService,
+ private readonly timelineActivityMetadataDiagnosticsService: TimelineActivityMetadataDiagnosticsService,
) {}
async upsertEvents({
@@ -118,7 +131,7 @@ export class TimelineActivityService {
sourceRules,
junctionRules,
flatFieldMetadataMaps,
- resolveTimelineActivityTypeId,
+ resolveTimelineActivityType,
} = await this.timelineActivityRuleBuilderService.getRulesForEventBatch({
workspaceId,
flatObjectMetadata: objectMetadata,
@@ -152,7 +165,7 @@ export class TimelineActivityService {
action,
workspaceId,
flatFieldMetadataMaps,
- resolveTimelineActivityTypeId,
+ resolveTimelineActivityType,
}),
),
...junctionRules.map((rule) =>
@@ -162,7 +175,7 @@ export class TimelineActivityService {
action,
workspaceId,
flatFieldMetadataMaps,
- resolveTimelineActivityTypeId,
+ resolveTimelineActivityType,
}),
),
]);
@@ -217,43 +230,60 @@ export class TimelineActivityService {
);
}
+ private resolveTimelineActivityTypeForRule({
+ rule,
+ ruleAction,
+ workspaceId,
+ resolveTimelineActivityType,
+ }: {
+ rule: TimelineActivityRule;
+ ruleAction: TimelineActivityRuleAction;
+ workspaceId: string;
+ resolveTimelineActivityType: TimelineActivityTypeResolver;
+ }): ResolvedTimelineActivityType | undefined {
+ const timelineActivityType =
+ rule.timelineActivityType ??
+ resolveTimelineActivityType({
+ action: ruleAction,
+ objectUniversalIdentifier:
+ rule.sourceFlatObjectMetadata.universalIdentifier,
+ });
+
+ if (!isDefined(timelineActivityType)) {
+ this.timelineActivityMetadataDiagnosticsService.report({
+ workspaceId,
+ reason: 'missing-type',
+ action: ruleAction,
+ objectUniversalIdentifier:
+ rule.sourceFlatObjectMetadata.universalIdentifier,
+ });
+ }
+
+ return timelineActivityType;
+ }
+
private async buildPayloadsForSourceRule({
rule,
events,
action,
workspaceId,
flatFieldMetadataMaps,
- resolveTimelineActivityTypeId,
- }: {
- rule: TimelineActivityRule;
- events: ObjectRecordBaseEvent[];
- action: DatabaseEventAction;
- workspaceId: string;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
- resolveTimelineActivityTypeId: TimelineActivityTypeResolver;
- }): Promise<TimelineActivityPayload[]> {
+ resolveTimelineActivityType,
+ }: BuildPayloadsForRuleArgs): Promise<TimelineActivityPayload[]> {
const ruleAction = SOURCE_EVENT_ACTIONS[action];
if (!isDefined(ruleAction)) {
return [];
}
- // A self rule writes the record's own row, which carries no linked record,
- // so it must not take the object-bound type: that one renders as a linked
- // entry and has no linked object to draw.
- const timelineActivityTypeId = resolveTimelineActivityTypeId({
- action: ruleAction,
- objectUniversalIdentifier:
- rule.targetShape.kind === 'SELF'
- ? undefined
- : rule.sourceFlatObjectMetadata.universalIdentifier,
+ const timelineActivityType = this.resolveTimelineActivityTypeForRule({
+ rule,
+ ruleAction,
+ workspaceId,
+ resolveTimelineActivityType,
});
- if (!isDefined(timelineActivityTypeId)) {
- this.logger.warn(
- `No timeline activity type resolves ${ruleAction} on ${rule.sourceFlatObjectMetadata.nameSingular} in workspace ${workspaceId}, dropping ${events.length} events`,
- );
-
+ if (!isDefined(timelineActivityType)) {
return [];
}
@@ -279,8 +309,9 @@ export class TimelineActivityService {
return [
{
- name: `${nameSingular}.${action}`,
- timelineActivityTypeId,
+ timelineActivityTypeId: timelineActivityType.id,
+ timelineActivityTypeSnapshot: timelineActivityType.snapshot,
+ happensAt: resolveTimelineActivityHappensAt(event),
objectSingularName: nameSingular,
recordId: event.recordId,
workspaceMemberId: event.workspaceMemberId,
@@ -303,8 +334,7 @@ export class TimelineActivityService {
(targetsBySourceRecordId.get(event.recordId) ?? []).map((target) =>
buildLinkedPayload({
rule,
- name: `linked-${rule.sourceFlatObjectMetadata.nameSingular}.${action}`,
- timelineActivityTypeId,
+ timelineActivityType,
target,
workspaceMemberId: event.workspaceMemberId,
linkedRecordId: event.recordId,
@@ -313,6 +343,7 @@ export class TimelineActivityService {
record: event.properties.after as ObjectRecord | undefined,
flatFieldMetadataMaps,
}),
+ happensAt: resolveTimelineActivityHappensAt(event),
properties: event.properties,
}),
),
@@ -325,38 +356,37 @@ export class TimelineActivityService {
action,
workspaceId,
flatFieldMetadataMaps,
- resolveTimelineActivityTypeId,
- }: {
- rule: TimelineActivityRule;
- events: ObjectRecordBaseEvent[];
- action: DatabaseEventAction;
- workspaceId: string;
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
- resolveTimelineActivityTypeId: TimelineActivityTypeResolver;
- }): Promise<TimelineActivityPayload[]> {
+ resolveTimelineActivityType,
+ }: BuildPayloadsForRuleArgs): Promise<TimelineActivityPayload[]> {
const ruleAction = JUNCTION_EVENT_ACTIONS[action];
if (!isDefined(ruleAction) || rule.targetShape.kind !== 'JUNCTION') {
return [];
}
- const timelineActivityTypeId = resolveTimelineActivityTypeId({
- action: ruleAction,
- objectUniversalIdentifier:
- rule.sourceFlatObjectMetadata.universalIdentifier,
+ const timelineActivityType = this.resolveTimelineActivityTypeForRule({
+ rule,
+ ruleAction,
+ workspaceId,
+ resolveTimelineActivityType,
});
- if (!isDefined(timelineActivityTypeId)) {
- this.logger.warn(
- `No timeline activity type resolves ${ruleAction} on ${rule.sourceFlatObjectMetadata.nameSingular} in workspace ${workspaceId}, dropping ${events.length} events`,
- );
-
+ if (!isDefined(timelineActivityType)) {
return [];
}
- const { junctionSourceJoinColumnName } = rule.targetShape;
+ const targetShape = rule.targetShape;
+ const { junctionSourceJoinColumnName } = targetShape;
const eventsWithJunctionRecord = events
+ .filter(
+ (event) =>
+ action !== 'updated' ||
+ doesTimelineActivityJunctionLinkChange({
+ event,
+ targetShape,
+ }),
+ )
.filter((event) => this.ruleMatchesEvent({ rule, ruleAction, event }))
.map((event) => {
const junctionRecord = event.properties.after as
@@ -393,26 +423,24 @@ export class TimelineActivityService {
},
);
- return eventsWithJunctionRecord
- .filter(({ sourceRecordId }) =>
- sourceRecordsByRecordId.has(sourceRecordId),
- )
- .map(({ event, target, sourceRecordId }) =>
- buildLinkedPayload({
+ // The junction event is the semantic fact; this enrichment read can race
+ // the transaction that created the linked record.
+ return eventsWithJunctionRecord.map(({ event, target, sourceRecordId }) =>
+ buildLinkedPayload({
+ rule,
+ timelineActivityType,
+ target,
+ workspaceMemberId: event.workspaceMemberId,
+ linkedRecordId: sourceRecordId,
+ linkedRecordCachedName: resolveLinkedRecordCachedName({
rule,
- name: `linked-${rule.sourceFlatObjectMetadata.nameSingular}.${action}`,
- timelineActivityTypeId,
- target,
- workspaceMemberId: event.workspaceMemberId,
- linkedRecordId: sourceRecordId,
- linkedRecordCachedName: resolveLinkedRecordCachedName({
- rule,
- record: sourceRecordsByRecordId.get(sourceRecordId),
- flatFieldMetadataMaps,
- }),
- properties: {},
+ record: sourceRecordsByRecordId.get(sourceRecordId),
+ flatFieldMetadataMaps,
}),
- );
+ happensAt: resolveTimelineActivityHappensAt(event),
+ properties: {},
+ }),
+ );
}
private async enrichEventsWithWorkspaceMemberId({
diff --git a/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts b/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
index 4843ea565dd..f95375f0265 100644
--- a/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
@@ -1,3 +1,5 @@
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
+
import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
import { type CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migration/types/entity-relation.interface';
@@ -18,6 +20,7 @@ export class TimelineActivityWorkspaceEntity extends BaseWorkspaceEntity {
happensAt: Date;
name: string | null;
timelineActivityTypeId: string | null;
+ timelineActivityTypeSnapshot: TimelineActivityTypeSnapshot | null;
properties: JSON | null;
linkedRecordCachedName: string | null;
linkedRecordId: string | null;
diff --git a/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts b/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts
index bc5c6077713..02010365734 100644
--- a/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts
+++ b/packages/twenty-server/src/modules/timeline/timeline-activity.module.ts
@@ -8,6 +8,9 @@ import { TimelineActivityTargetQueryService } from 'src/modules/timeline/service
import { TimelineActivityTypeCacheService } from 'src/modules/timeline/services/timeline-activity-type-cache.service';
import { TimelineActivityService } from 'src/modules/timeline/services/timeline-activity.service';
import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
+import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
+import { TimelineActivityMetadataDiagnosticsService } from 'src/modules/timeline/services/timeline-activity-metadata-diagnostics.service';
+import { TimelineActivityEventEligibilityService } from 'src/modules/timeline/services/timeline-activity-event-eligibility.service';
@Module({
imports: [
@@ -16,13 +19,20 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-o
]),
TwentyORMModule,
WorkspaceManyOrAllFlatEntityMapsCacheModule,
+ MetricsModule,
],
providers: [
TimelineActivityService,
TimelineActivityRuleBuilderService,
TimelineActivityTargetQueryService,
TimelineActivityTypeCacheService,
+ TimelineActivityMetadataDiagnosticsService,
+ TimelineActivityEventEligibilityService,
+ ],
+ exports: [
+ TimelineActivityService,
+ TimelineActivityTypeCacheService,
+ TimelineActivityEventEligibilityService,
],
- exports: [TimelineActivityService, TimelineActivityTypeCacheService],
})
export class TimelineActivityModule {}
diff --git a/packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.ts b/packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.ts
index 9c5c397b88a..5c13e396bed 100644
--- a/packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.ts
+++ b/packages/twenty-server/src/modules/timeline/types/timeline-activity-payload.ts
@@ -1,13 +1,15 @@
import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
export type TimelineActivityPayload = {
+ happensAt: Date;
properties: ObjectRecordBaseEvent['properties'];
linkedObjectMetadataId?: string;
linkedRecordId?: string;
linkedRecordCachedName?: string;
workspaceMemberId?: string;
- name: string;
timelineActivityTypeId: string;
+ timelineActivityTypeSnapshot: TimelineActivityTypeSnapshot;
recordId: string;
objectSingularName?: string;
};
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.ts
index a372cdac3da..8a375672db6 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
@@ -1,13 +1,12 @@
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';
import { type TimelineActivityRuleTargetShape } from 'src/modules/timeline/types/timeline-activity-rule-target-shape.type';
+import { type ResolvedTimelineActivityType } from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
export type TimelineActivityRule = {
- // Object whose events trigger this rule. Carried whole so the label of a
- // linked record resolves through the shared display-name logic
sourceFlatObjectMetadata: FlatObjectMetadata;
actions: TimelineActivityRuleAction[];
- // Diff keys gating the `updated` action. null = any field
+ timelineActivityType?: ResolvedTimelineActivityType;
triggerFieldNames: string[] | null;
targetShape: TimelineActivityRuleTargetShape;
};
diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/build-timeline-activity-merge-key.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/build-timeline-activity-merge-key.util.spec.ts
new file mode 100644
index 00000000000..430e002aa67
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/build-timeline-activity-merge-key.util.spec.ts
@@ -0,0 +1,95 @@
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
+
+import {
+ buildTimelineActivityMergeKey,
+ buildTimelineActivityMergeKeyCandidates,
+} from 'src/modules/timeline/utils/build-timeline-activity-merge-key.util';
+
+const buildSnapshot = (
+ overrides: Partial<TimelineActivityTypeSnapshot> = {},
+): TimelineActivityTypeSnapshot => ({
+ id: '20202020-0000-4000-8000-000000000001',
+ universalIdentifier: '20202020-0000-4000-8000-000000000002',
+ name: 'recordUpdated',
+ label: 'was updated by',
+ action: 'updated',
+ icon: 'IconPencil',
+ objectUniversalIdentifier: null,
+ frontComponentUniversalIdentifier: null,
+ ...overrides,
+});
+
+const buildKey = ({
+ workspaceMemberId = '20202020-0000-4000-8000-000000000003',
+ snapshot = buildSnapshot(),
+}: {
+ workspaceMemberId?: string | null;
+ snapshot?: TimelineActivityTypeSnapshot;
+} = {}) =>
+ buildTimelineActivityMergeKey({
+ recordId: '20202020-0000-4000-8000-000000000004',
+ workspaceMemberId,
+ timelineActivityTypeId: '20202020-0000-4000-8000-000000000001',
+ timelineActivityTypeSnapshot: snapshot,
+ });
+
+describe('buildTimelineActivityMergeKey', () => {
+ it('ignores live presentation values while preserving frozen semantics', () => {
+ expect(
+ buildKey({
+ snapshot: buildSnapshot({
+ name: 'renamed',
+ label: 'has changed',
+ icon: 'IconRefresh',
+ frontComponentUniversalIdentifier:
+ '20202020-0000-4000-8000-000000000005',
+ }),
+ }),
+ ).toBe(buildKey());
+ });
+
+ it.each([
+ { action: 'created' },
+ {
+ universalIdentifier: '20202020-0000-4000-8000-000000000006',
+ },
+ {
+ objectUniversalIdentifier: '20202020-0000-4000-8000-000000000007',
+ },
+ ] satisfies Partial<TimelineActivityTypeSnapshot>[])(
+ 'keeps semantic snapshot fields in the frozen merge identity',
+ (snapshotOverride) => {
+ expect(buildKey({ snapshot: buildSnapshot(snapshotOverride) })).not.toBe(
+ buildKey(),
+ );
+ },
+ );
+
+ it('normalizes an absent author', () => {
+ expect(buildKey({ workspaceMemberId: null })).toBe(
+ buildTimelineActivityMergeKey({
+ recordId: '20202020-0000-4000-8000-000000000004',
+ workspaceMemberId: undefined,
+ timelineActivityTypeId: '20202020-0000-4000-8000-000000000001',
+ timelineActivityTypeSnapshot: buildSnapshot(),
+ }),
+ );
+ });
+
+ it('falls back to the pre-snapshot identity during rolling upgrades', () => {
+ const args = {
+ recordId: '20202020-0000-4000-8000-000000000004',
+ workspaceMemberId: '20202020-0000-4000-8000-000000000003',
+ timelineActivityTypeId: '20202020-0000-4000-8000-000000000001',
+ timelineActivityTypeSnapshot: buildSnapshot(),
+ };
+
+ expect(buildTimelineActivityMergeKeyCandidates(args)).toEqual([
+ buildTimelineActivityMergeKey(args),
+ buildTimelineActivityMergeKey({
+ ...args,
+ timelineActivityTypeSnapshot: null,
+ }),
+ ]);
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/build-timeline-activity-self-rule.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/build-timeline-activity-self-rule.util.spec.ts
new file mode 100644
index 00000000000..250cf69f196
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/build-timeline-activity-self-rule.util.spec.ts
@@ -0,0 +1,86 @@
+import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
+import { buildTimelineActivitySelfRule } from 'src/modules/timeline/utils/build-timeline-activity-self-rule.util';
+
+const COMPANY_FLAT_OBJECT_METADATA = getFlatObjectMetadataMock({
+ universalIdentifier: 'company-universal-identifier',
+ id: 'company-object-id',
+ nameSingular: 'company',
+ isAuditLogged: true,
+ isSystem: false,
+});
+
+const createdSelfEmitter = {
+ action: 'created' as const,
+ objectUniversalIdentifier: COMPANY_FLAT_OBJECT_METADATA.universalIdentifier,
+ targetRelationFieldUniversalIdentifier: null,
+};
+
+describe('buildTimelineActivitySelfRule', () => {
+ it('combines default audit actions with declared emitters without duplicates', () => {
+ expect(
+ buildTimelineActivitySelfRule({
+ flatObjectMetadata: COMPANY_FLAT_OBJECT_METADATA,
+ timelineActivityTypes: [createdSelfEmitter],
+ }),
+ ).toMatchObject({
+ actions: ['created', 'updated', 'deleted', 'restored'],
+ targetShape: { kind: 'SELF' },
+ });
+ });
+
+ it('builds a self rule from a declaration when default audit is disabled', () => {
+ expect(
+ buildTimelineActivitySelfRule({
+ flatObjectMetadata: {
+ ...COMPANY_FLAT_OBJECT_METADATA,
+ isAuditLogged: false,
+ },
+ timelineActivityTypes: [createdSelfEmitter],
+ }),
+ ).toMatchObject({
+ actions: ['created'],
+ targetShape: { kind: 'SELF' },
+ });
+ });
+
+ it('omits a self rule when neither defaults nor declarations apply', () => {
+ expect(
+ buildTimelineActivitySelfRule({
+ flatObjectMetadata: {
+ ...COMPANY_FLAT_OBJECT_METADATA,
+ isAuditLogged: false,
+ },
+ timelineActivityTypes: [],
+ }),
+ ).toBeUndefined();
+ });
+
+ it('does not add default actions to system objects', () => {
+ expect(
+ buildTimelineActivitySelfRule({
+ flatObjectMetadata: {
+ ...COMPANY_FLAT_OBJECT_METADATA,
+ isSystem: true,
+ },
+ timelineActivityTypes: [],
+ }),
+ ).toBeUndefined();
+ });
+
+ it('does not derive self actions from through emitters', () => {
+ expect(
+ buildTimelineActivitySelfRule({
+ flatObjectMetadata: {
+ ...COMPANY_FLAT_OBJECT_METADATA,
+ isAuditLogged: false,
+ },
+ timelineActivityTypes: [
+ {
+ ...createdSelfEmitter,
+ targetRelationFieldUniversalIdentifier: 'relation-identifier',
+ },
+ ],
+ }),
+ ).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/derive-default-timeline-activity-rule.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/derive-default-timeline-activity-rule.util.spec.ts
deleted file mode 100644
index 12b9523c927..00000000000
--- a/packages/twenty-server/src/modules/timeline/utils/__tests__/derive-default-timeline-activity-rule.util.spec.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { getFlatObjectMetadataMock } from 'src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock';
-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { deriveDefaultTimelineActivityRule } from 'src/modules/timeline/utils/derive-default-timeline-activity-rule.util';
-
-const COMPANY_FLAT_OBJECT_METADATA = getFlatObjectMetadataMock({
- universalIdentifier: 'company-universal-identifier',
- id: 'company-object-id',
- nameSingular: 'company',
- isAuditLogged: true,
- isSystem: false,
-});
-
-const withOverrides = (
- overrides: Partial<FlatObjectMetadata>,
-): FlatObjectMetadata => ({ ...COMPANY_FLAT_OBJECT_METADATA, ...overrides });
-
-describe('deriveDefaultTimelineActivityRule', () => {
- it('should derive a self rule for an audit logged non system object', () => {
- expect(
- deriveDefaultTimelineActivityRule(COMPANY_FLAT_OBJECT_METADATA),
- ).toEqual({
- sourceFlatObjectMetadata: COMPANY_FLAT_OBJECT_METADATA,
- actions: ['created', 'updated', 'deleted', 'restored'],
- triggerFieldNames: null,
- targetShape: { kind: 'SELF' },
- });
- });
-
- it('should not derive a rule when the object is not audit logged', () => {
- expect(
- deriveDefaultTimelineActivityRule(
- withOverrides({ isAuditLogged: false }),
- ),
- ).toBeUndefined();
- });
-
- it('should not derive a rule for a system object', () => {
- expect(
- deriveDefaultTimelineActivityRule(
- withOverrides({ isSystem: true, nameSingular: 'noteTarget' }),
- ),
- ).toBeUndefined();
- });
-});
diff --git a/packages/twenty-server/src/modules/timeline/utils/__tests__/does-timeline-activity-junction-link-change.util.spec.ts b/packages/twenty-server/src/modules/timeline/utils/__tests__/does-timeline-activity-junction-link-change.util.spec.ts
new file mode 100644
index 00000000000..1f1d4bd1692
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/does-timeline-activity-junction-link-change.util.spec.ts
@@ -0,0 +1,81 @@
+import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';
+
+import { type TimelineActivityRuleTargetShape } from 'src/modules/timeline/types/timeline-activity-rule-target-shape.type';
+import { doesTimelineActivityJunctionLinkChange } from 'src/modules/timeline/utils/does-timeline-activity-junction-link-change.util';
+
+const targetShape: Extract<
+ TimelineActivityRuleTargetShape,
+ { kind: 'JUNCTION' }
+> = {
+ kind: 'JUNCTION',
+ junctionObjectMetadataId: 'junction-object-id',
+ junctionObjectNameSingular: 'messageParticipant',
+ junctionSourceJoinColumnName: 'messageId',
+ junctionTargetJoinColumns: [
+ { joinColumnName: 'personId', targetObjectNameSingular: 'person' },
+ { joinColumnName: 'workspaceMemberId', targetObjectNameSingular: 'member' },
+ ],
+};
+
+const buildEvent = ({
+ updatedFields,
+ diff,
+}: {
+ updatedFields?: string[];
+ diff?: Record<string, unknown>;
+}) =>
+ ({
+ recordId: 'junction-record-id',
+ properties: { updatedFields, diff },
+ }) as ObjectRecordBaseEvent<Record<string, unknown>>;
+
+describe('doesTimelineActivityJunctionLinkChange', () => {
+ it('detects a join column from canonical ORM updated fields', () => {
+ expect(
+ doesTimelineActivityJunctionLinkChange({
+ event: buildEvent({
+ updatedFields: ['person', 'personId'],
+ diff: { person: { before: { id: null }, after: { id: 'id' } } },
+ }),
+ targetShape,
+ }),
+ ).toBe(true);
+ });
+
+ it.each(['messageId', 'personId', 'workspaceMemberId'])(
+ 'detects a change to the %s join column',
+ (joinColumnName) => {
+ expect(
+ doesTimelineActivityJunctionLinkChange({
+ event: buildEvent({
+ diff: {
+ [joinColumnName]: { before: null, after: 'id' },
+ },
+ }),
+ targetShape,
+ }),
+ ).toBe(true);
+ },
+ );
+
+ it('ignores updates to non-link fields', () => {
+ expect(
+ doesTimelineActivityJunctionLinkChange({
+ event: buildEvent({
+ updatedFields: ['handle'],
+ diff: { handle: { before: 'old', after: 'new' } },
+ }),
+ targetShape,
+ }),
+ ).toBe(false);
+ });
+
+ it('ignores updates without a diff', () => {
+ expect(
+ doesTimelineActivityJunctionLinkChange({
+ event: buildEvent({}),
+ targetShape,
+ }),
+ ).toBe(false);
+ });
+});
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.ts
new file mode 100644
index 00000000000..32f4d2e2828
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-happens-at.util.spec.ts
@@ -0,0 +1,33 @@
+import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';
+
+import { resolveTimelineActivityHappensAt } from 'src/modules/timeline/utils/resolve-timeline-activity-happens-at.util';
+
+const EVENT_TIME = new Date('2026-08-22T12:00:00.000Z');
+
+describe('resolveTimelineActivityHappensAt', () => {
+ it('uses the mutation timestamp from the record after the event', () => {
+ const event = {
+ properties: { after: { updatedAt: EVENT_TIME.toISOString() } },
+ } as ObjectRecordBaseEvent;
+
+ expect(resolveTimelineActivityHappensAt(event)).toEqual(EVENT_TIME);
+ });
+
+ it('uses the record before the event when no after record exists', () => {
+ const event = {
+ properties: { before: { updatedAt: EVENT_TIME } },
+ } as ObjectRecordBaseEvent;
+
+ expect(resolveTimelineActivityHappensAt(event)).toEqual(EVENT_TIME);
+ });
+
+ it('falls back to the processing time for legacy events without timestamps', () => {
+ jest.useFakeTimers().setSystemTime(EVENT_TIME);
+
+ const event = { properties: {} } as ObjectRecordBaseEvent;
+
+ expect(resolveTimelineActivityHappensAt(event)).toEqual(EVENT_TIME);
+
+ jest.useRealTimers();
+ });
+});
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.ts
new file mode 100644
index 00000000000..c31db118e2a
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type-routing.util.spec.ts
@@ -0,0 +1,60 @@
+import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
+
+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';
+import { type ResolvableTimelineActivityType } from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
+
+const noteUpdatedDefinition = STANDARD_TIMELINE_ACTIVITY_TYPE_DEFINITIONS.find(
+ ({ name }) => name === 'noteUpdated',
+);
+
+if (!noteUpdatedDefinition) {
+ throw new Error('Missing noteUpdated standard timeline activity type');
+}
+
+const timelineActivityType = {
+ universalIdentifier: noteUpdatedDefinition.universalIdentifier,
+ applicationUniversalIdentifier:
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+} as ResolvableTimelineActivityType;
+
+describe('resolveTimelineActivityTypeRouting', () => {
+ it('uses frozen standard routing while a workspace is still upgrading', () => {
+ expect(resolveTimelineActivityTypeRouting(timelineActivityType)).toEqual({
+ targetRelationFieldUniversalIdentifier:
+ noteUpdatedDefinition.targetRelationFieldUniversalIdentifier,
+ triggerFieldUniversalIdentifiers:
+ noteUpdatedDefinition.triggerFieldUniversalIdentifiers,
+ });
+ });
+
+ it('does not grant the standard compatibility fallback to applications', () => {
+ expect(
+ resolveTimelineActivityTypeRouting({
+ ...timelineActivityType,
+ applicationUniversalIdentifier: '00000000-0000-4000-8000-000000000001',
+ }),
+ ).toBeUndefined();
+ });
+
+ it('prefers synced routing once the workspace command has run', () => {
+ expect(
+ resolveTimelineActivityTypeRouting({
+ ...timelineActivityType,
+ targetRelationFieldUniversalIdentifier:
+ '00000000-0000-4000-8000-000000000002',
+ triggerFieldUniversalIdentifiers: [
+ '00000000-0000-4000-8000-000000000003',
+ ],
+ }),
+ ).toEqual({
+ targetRelationFieldUniversalIdentifier:
+ '00000000-0000-4000-8000-000000000002',
+ triggerFieldUniversalIdentifiers: [
+ '00000000-0000-4000-8000-000000000003',
+ ],
+ });
+ });
+});
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.ts
new file mode 100644
index 00000000000..9240f600c88
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/__tests__/resolve-timeline-activity-type.util.spec.ts
@@ -0,0 +1,313 @@
+import {
+ buildTimelineActivityTypeResolution,
+ type TimelineActivityTypeResolutionMaps,
+} from 'src/modules/timeline/utils/resolve-timeline-activity-type.util';
+
+const SHARED_LINKED_ID = '00000000-0000-4000-8000-000000000001';
+const NOTE_LINKED_ID = '00000000-0000-4000-8000-000000000002';
+const NOTE_UNIVERSAL_IDENTIFIER = '00000000-0000-4000-8000-000000000010';
+const NOTE_TARGETS_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000105';
+const FRONT_COMPONENT_UNIVERSAL_IDENTIFIER =
+ '00000000-0000-4000-8000-000000000020';
+const APPLICATION_ID = '00000000-0000-4000-8000-000000000030';
+const APPLICATION_UNIVERSAL_IDENTIFIER = '00000000-0000-4000-8000-000000000031';
+
+const noteLinkedTimelineActivityType = {
+ id: NOTE_LINKED_ID,
+ applicationId: APPLICATION_ID,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ universalIdentifier: '00000000-0000-4000-8000-000000000102',
+ name: 'note.linked',
+ label: 'Linked a note',
+ action: 'linked' as const,
+ icon: 'IconNotes',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ frontComponentUniversalIdentifier: FRONT_COMPONENT_UNIVERSAL_IDENTIFIER,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ isActive: true,
+ overrides: null,
+};
+
+const flatTimelineActivityTypeMaps: TimelineActivityTypeResolutionMaps = {
+ byUniversalIdentifier: {
+ recordLinked: {
+ id: SHARED_LINKED_ID,
+ applicationId: APPLICATION_ID,
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ universalIdentifier: '00000000-0000-4000-8000-000000000101',
+ name: 'record.linked',
+ label: 'Linked a record',
+ action: 'linked',
+ icon: 'IconLink',
+ objectUniversalIdentifier: null,
+ targetRelationFieldUniversalIdentifier: null,
+ triggerFieldUniversalIdentifiers: null,
+ frontComponentUniversalIdentifier: null,
+ replacesTimelineActivityTypeUniversalIdentifier: null,
+ isActive: true,
+ overrides: null,
+ },
+ noteLinked: noteLinkedTimelineActivityType,
+ },
+ objectMetadataByUniversalIdentifier: {
+ [NOTE_UNIVERSAL_IDENTIFIER]: {
+ applicationUniversalIdentifier: APPLICATION_UNIVERSAL_IDENTIFIER,
+ },
+ },
+};
+
+describe('buildTimelineActivityTypeResolution', () => {
+ const { resolveTimelineActivityType } = buildTimelineActivityTypeResolution(
+ flatTimelineActivityTypeMaps,
+ );
+
+ it('returns the object-bound type and its immutable render snapshot', () => {
+ expect(
+ resolveTimelineActivityType({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ }),
+ ).toEqual({
+ id: NOTE_LINKED_ID,
+ applicationId: APPLICATION_ID,
+ snapshot: {
+ id: NOTE_LINKED_ID,
+ universalIdentifier: '00000000-0000-4000-8000-000000000102',
+ name: 'note.linked',
+ label: 'Linked a note',
+ action: 'linked',
+ icon: 'IconNotes',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ frontComponentUniversalIdentifier: FRONT_COMPONENT_UNIVERSAL_IDENTIFIER,
+ },
+ });
+ });
+
+ it('falls back to a shared type', () => {
+ expect(
+ resolveTimelineActivityType({
+ action: 'linked',
+ objectUniversalIdentifier: '00000000-0000-4000-8000-000000000099',
+ })?.id,
+ ).toBe(SHARED_LINKED_ID);
+ });
+
+ it('does not fall back when the matching object type is inactive', () => {
+ const { resolveTimelineActivityType: resolver } =
+ buildTimelineActivityTypeResolution({
+ ...flatTimelineActivityTypeMaps,
+ byUniversalIdentifier: {
+ ...flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ noteLinked: {
+ ...noteLinkedTimelineActivityType,
+ isActive: false,
+ },
+ },
+ });
+
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('stores workspace presentation overrides in the durable snapshot', () => {
+ const { resolveTimelineActivityType: resolver } =
+ buildTimelineActivityTypeResolution({
+ ...flatTimelineActivityTypeMaps,
+ byUniversalIdentifier: {
+ ...flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ noteLinked: {
+ ...noteLinkedTimelineActivityType,
+ overrides: {
+ label: 'Added a note',
+ icon: 'IconPencil',
+ },
+ },
+ },
+ });
+
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ })?.snapshot,
+ ).toMatchObject({ label: 'Added a note', icon: 'IconPencil' });
+ });
+
+ it('does not treat a routed type as a source record resolver', () => {
+ const {
+ resolveTimelineActivityType: resolver,
+ effectiveTimelineActivityTypes,
+ } = buildTimelineActivityTypeResolution({
+ objectMetadataByUniversalIdentifier:
+ flatTimelineActivityTypeMaps.objectMetadataByUniversalIdentifier,
+ byUniversalIdentifier: {
+ ...flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ routedNoteLinked: {
+ ...noteLinkedTimelineActivityType,
+ id: '00000000-0000-4000-8000-000000000004',
+ universalIdentifier: '00000000-0000-4000-8000-000000000104',
+ targetRelationFieldUniversalIdentifier:
+ NOTE_TARGETS_UNIVERSAL_IDENTIFIER,
+ },
+ },
+ });
+
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ })?.id,
+ ).toBe(NOTE_LINKED_ID);
+ expect(effectiveTimelineActivityTypes.map(({ id }) => id)).toContain(
+ '00000000-0000-4000-8000-000000000004',
+ );
+ });
+
+ it('isolates a routed emit conflict from the source record resolver', () => {
+ const routedTimelineActivityType = {
+ ...noteLinkedTimelineActivityType,
+ id: '00000000-0000-4000-8000-000000000004',
+ universalIdentifier: '00000000-0000-4000-8000-000000000104',
+ targetRelationFieldUniversalIdentifier: NOTE_TARGETS_UNIVERSAL_IDENTIFIER,
+ };
+ const {
+ resolveTimelineActivityType: resolver,
+ routingConflicts,
+ effectiveTimelineActivityTypes,
+ } = buildTimelineActivityTypeResolution({
+ objectMetadataByUniversalIdentifier:
+ flatTimelineActivityTypeMaps.objectMetadataByUniversalIdentifier,
+ byUniversalIdentifier: {
+ ...flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ routed: routedTimelineActivityType,
+ duplicateRouted: {
+ ...routedTimelineActivityType,
+ id: '00000000-0000-4000-8000-000000000005',
+ universalIdentifier: '00000000-0000-4000-8000-000000000106',
+ },
+ },
+ });
+
+ expect(routingConflicts).toEqual([
+ {
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ },
+ ]);
+ expect(effectiveTimelineActivityTypes.map(({ id }) => id)).not.toContain(
+ routedTimelineActivityType.id,
+ );
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ })?.id,
+ ).toBe(NOTE_LINKED_ID);
+ });
+
+ it('isolates an ambiguous object contract without falling back', () => {
+ const {
+ resolveTimelineActivityType: resolver,
+ routingConflicts,
+ resolverConflicts,
+ } = buildTimelineActivityTypeResolution({
+ objectMetadataByUniversalIdentifier:
+ flatTimelineActivityTypeMaps.objectMetadataByUniversalIdentifier,
+ byUniversalIdentifier: {
+ ...flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ duplicate: {
+ ...noteLinkedTimelineActivityType,
+ id: '00000000-0000-4000-8000-000000000003',
+ universalIdentifier: '00000000-0000-4000-8000-000000000103',
+ },
+ },
+ });
+
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ }),
+ ).toBeUndefined();
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: '00000000-0000-4000-8000-000000000099',
+ })?.id,
+ ).toBe(SHARED_LINKED_ID);
+ expect(resolverConflicts).toEqual([
+ {
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ },
+ ]);
+ expect(routingConflicts).toEqual([]);
+ });
+
+ it('selects an explicit override deterministically', () => {
+ const overrideUniversalIdentifier = '00000000-0000-4000-8000-000000000103';
+ const { resolveTimelineActivityType: resolver, resolverConflicts } =
+ buildTimelineActivityTypeResolution({
+ objectMetadataByUniversalIdentifier:
+ flatTimelineActivityTypeMaps.objectMetadataByUniversalIdentifier,
+ byUniversalIdentifier: {
+ ...flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ override: {
+ ...noteLinkedTimelineActivityType,
+ id: '00000000-0000-4000-8000-000000000003',
+ applicationUniversalIdentifier:
+ '00000000-0000-4000-8000-000000000032',
+ universalIdentifier: overrideUniversalIdentifier,
+ replacesTimelineActivityTypeUniversalIdentifier:
+ noteLinkedTimelineActivityType.universalIdentifier,
+ },
+ },
+ });
+
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ })?.snapshot.universalIdentifier,
+ ).toBe(overrideUniversalIdentifier);
+ expect(resolverConflicts).toEqual([]);
+ });
+
+ it('ignores and reports an implicit foreign-object takeover', () => {
+ const { resolveTimelineActivityType: resolver, invalidContracts } =
+ buildTimelineActivityTypeResolution({
+ objectMetadataByUniversalIdentifier:
+ flatTimelineActivityTypeMaps.objectMetadataByUniversalIdentifier,
+ byUniversalIdentifier: {
+ ...flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ takeover: {
+ ...noteLinkedTimelineActivityType,
+ id: '00000000-0000-4000-8000-000000000005',
+ applicationUniversalIdentifier:
+ '00000000-0000-4000-8000-000000000032',
+ universalIdentifier: '00000000-0000-4000-8000-000000000105',
+ },
+ },
+ });
+
+ expect(
+ resolver({
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ })?.id,
+ ).toBe(NOTE_LINKED_ID);
+ expect(invalidContracts).toEqual([
+ {
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ },
+ ]);
+ });
+});
diff --git a/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-merge-key.util.ts b/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-merge-key.util.ts
new file mode 100644
index 00000000000..0e19d821519
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-merge-key.util.ts
@@ -0,0 +1,41 @@
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
+
+type TimelineActivityMergeKeyArgs = {
+ recordId: string;
+ workspaceMemberId: string | null | undefined;
+ timelineActivityTypeId: string;
+ timelineActivityTypeSnapshot: TimelineActivityTypeSnapshot | null;
+};
+
+export const buildTimelineActivityMergeKey = ({
+ recordId,
+ workspaceMemberId,
+ timelineActivityTypeId,
+ timelineActivityTypeSnapshot,
+}: TimelineActivityMergeKeyArgs): string =>
+ JSON.stringify([
+ recordId,
+ workspaceMemberId ?? null,
+ timelineActivityTypeId,
+ timelineActivityTypeSnapshot?.universalIdentifier,
+ timelineActivityTypeSnapshot?.action,
+ timelineActivityTypeSnapshot?.objectUniversalIdentifier,
+ ]);
+
+export const buildTimelineActivityMergeKeyCandidates = (
+ args: TimelineActivityMergeKeyArgs,
+): string[] => {
+ const exactKey = buildTimelineActivityMergeKey(args);
+
+ if (args.timelineActivityTypeSnapshot === null) {
+ return [exactKey];
+ }
+
+ return [
+ exactKey,
+ buildTimelineActivityMergeKey({
+ ...args,
+ timelineActivityTypeSnapshot: null,
+ }),
+ ];
+};
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.ts
new file mode 100644
index 00000000000..33aba8f34ba
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/build-timeline-activity-self-rule.util.ts
@@ -0,0 +1,54 @@
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
+import { type TimelineActivityRuleAction } from 'src/modules/timeline/types/timeline-activity-rule-action.type';
+import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';
+
+const DEFAULT_SELF_RULE_ACTIONS = [
+ 'created',
+ 'updated',
+ 'deleted',
+ 'restored',
+] as const;
+
+export const buildTimelineActivitySelfRule = ({
+ flatObjectMetadata,
+ timelineActivityTypes,
+}: {
+ flatObjectMetadata: FlatObjectMetadata;
+ timelineActivityTypes: Pick<
+ FlatTimelineActivityType,
+ | 'action'
+ | 'objectUniversalIdentifier'
+ | 'targetRelationFieldUniversalIdentifier'
+ >[];
+}): TimelineActivityRule | undefined => {
+ const declaredActions = timelineActivityTypes
+ .filter(
+ (timelineActivityType) =>
+ timelineActivityType.objectUniversalIdentifier ===
+ flatObjectMetadata.universalIdentifier &&
+ !isDefined(timelineActivityType.targetRelationFieldUniversalIdentifier),
+ )
+ .map(({ action }) => action)
+ .filter(isDefined);
+ const defaultActions =
+ flatObjectMetadata.isAuditLogged && !flatObjectMetadata.isSystem
+ ? DEFAULT_SELF_RULE_ACTIONS
+ : [];
+ const actions: TimelineActivityRuleAction[] = [
+ ...new Set([...defaultActions, ...declaredActions]),
+ ];
+
+ if (!isNonEmptyArray(actions)) {
+ return undefined;
+ }
+
+ return {
+ sourceFlatObjectMetadata: flatObjectMetadata,
+ actions,
+ triggerFieldNames: null,
+ targetShape: { kind: 'SELF' },
+ };
+};
diff --git a/packages/twenty-server/src/modules/timeline/utils/derive-default-timeline-activity-rule.util.ts b/packages/twenty-server/src/modules/timeline/utils/derive-default-timeline-activity-rule.util.ts
deleted file mode 100644
index 23bdf88c8e8..00000000000
--- a/packages/twenty-server/src/modules/timeline/utils/derive-default-timeline-activity-rule.util.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { type TimelineActivityRule } from 'src/modules/timeline/types/timeline-activity-rule.type';
-
-const SELF_RULE_ACTIONS = [
- 'created',
- 'updated',
- 'deleted',
- 'restored',
-] as const;
-
-// Every audit logged non system object records its own changes. Materialising
-// this as a row per object would mean backfilling every object of every
-// workspace, so it is derived and only overrides are persisted.
-export const deriveDefaultTimelineActivityRule = (
- flatObjectMetadata: FlatObjectMetadata,
-): TimelineActivityRule | undefined => {
- if (!flatObjectMetadata.isAuditLogged || flatObjectMetadata.isSystem) {
- return undefined;
- }
-
- return {
- sourceFlatObjectMetadata: flatObjectMetadata,
- actions: [...SELF_RULE_ACTIONS],
- triggerFieldNames: null,
- targetShape: { kind: 'SELF' },
- };
-};
diff --git a/packages/twenty-server/src/modules/timeline/utils/does-timeline-activity-junction-link-change.util.ts b/packages/twenty-server/src/modules/timeline/utils/does-timeline-activity-junction-link-change.util.ts
new file mode 100644
index 00000000000..19098faab36
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/does-timeline-activity-junction-link-change.util.ts
@@ -0,0 +1,35 @@
+import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type TimelineActivityRuleTargetShape } from 'src/modules/timeline/types/timeline-activity-rule-target-shape.type';
+
+export const doesTimelineActivityJunctionLinkChange = ({
+ event,
+ targetShape,
+}: {
+ event: ObjectRecordBaseEvent;
+ targetShape: Extract<TimelineActivityRuleTargetShape, { kind: 'JUNCTION' }>;
+}): boolean => {
+ const { updatedFields, diff } = event.properties;
+
+ const joinColumnNames = [
+ targetShape.junctionSourceJoinColumnName,
+ ...targetShape.junctionTargetJoinColumns.map(
+ ({ joinColumnName }) => joinColumnName,
+ ),
+ ];
+
+ if (isDefined(updatedFields)) {
+ return joinColumnNames.some((joinColumnName) =>
+ updatedFields.includes(joinColumnName),
+ );
+ }
+
+ if (!isDefined(diff)) {
+ return false;
+ }
+
+ return joinColumnNames.some((joinColumnName) =>
+ Object.prototype.hasOwnProperty.call(diff, joinColumnName),
+ );
+};
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.ts
new file mode 100644
index 00000000000..8a627c75e2c
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-happens-at.util.ts
@@ -0,0 +1,36 @@
+import { type ObjectRecordBaseEvent } from 'twenty-shared/database-events';
+import { isNonEmptyString } from '@sniptt/guards';
+import { isDefined } from 'twenty-shared/utils';
+
+const parseTimestamp = (value: unknown): Date | undefined => {
+ if (value instanceof Date) {
+ return Number.isNaN(value.getTime()) ? undefined : value;
+ }
+
+ if (!isNonEmptyString(value)) {
+ return undefined;
+ }
+
+ const date = new Date(value);
+
+ return Number.isNaN(date.getTime()) ? undefined : date;
+};
+
+const getRecordTimestamp = (record: object | undefined): unknown => {
+ if (!isDefined(record)) {
+ return undefined;
+ }
+
+ const updatedAt = 'updatedAt' in record ? record.updatedAt : undefined;
+
+ return updatedAt ?? ('createdAt' in record ? record.createdAt : undefined);
+};
+
+export const resolveTimelineActivityHappensAt = (
+ event: ObjectRecordBaseEvent,
+): Date => {
+ const record = event.properties.after ?? event.properties.before;
+ const recordTimestamp = parseTimestamp(getRecordTimestamp(record));
+
+ return isDefined(recordTimestamp) ? recordTimestamp : new Date();
+};
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.ts
new file mode 100644
index 00000000000..abcbf839e10
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type-routing.util.ts
@@ -0,0 +1,58 @@
+import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
+import { isDefined } from 'twenty-shared/utils';
+
+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;
+};
+
+const STANDARD_ROUTING_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER = new Map<
+ string,
+ TimelineActivityTypeRouting
+>(
+ STANDARD_TIMELINE_ACTIVITY_ROUTINGS_2_34.map(
+ (routing) =>
+ [
+ routing.universalIdentifier,
+ {
+ targetRelationFieldUniversalIdentifier:
+ routing.targetRelationFieldUniversalIdentifier,
+ triggerFieldUniversalIdentifiers: isDefined(
+ routing.triggerFieldUniversalIdentifiers,
+ )
+ ? [...routing.triggerFieldUniversalIdentifiers]
+ : null,
+ },
+ ] as const,
+ ),
+);
+
+export const resolveTimelineActivityTypeRouting = (timelineActivityType: {
+ applicationUniversalIdentifier: string;
+ universalIdentifier: string;
+ targetRelationFieldUniversalIdentifier: string | null;
+ triggerFieldUniversalIdentifiers: string[] | null;
+}): TimelineActivityTypeRouting | undefined => {
+ if (isDefined(timelineActivityType.targetRelationFieldUniversalIdentifier)) {
+ return {
+ targetRelationFieldUniversalIdentifier:
+ timelineActivityType.targetRelationFieldUniversalIdentifier,
+ triggerFieldUniversalIdentifiers:
+ timelineActivityType.triggerFieldUniversalIdentifiers,
+ };
+ }
+
+ // Standard rows can be served before their 2.34 workspace command runs.
+ if (
+ timelineActivityType.applicationUniversalIdentifier !==
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER
+ ) {
+ return undefined;
+ }
+
+ return STANDARD_ROUTING_BY_TIMELINE_ACTIVITY_TYPE_UNIVERSAL_IDENTIFIER.get(
+ timelineActivityType.universalIdentifier,
+ );
+};
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.ts
new file mode 100644
index 00000000000..af069dc3e0b
--- /dev/null
+++ b/packages/twenty-server/src/modules/timeline/utils/resolve-timeline-activity-type.util.ts
@@ -0,0 +1,259 @@
+import {
+ type TimelineActivityAction,
+ type TimelineActivityTypeSnapshot,
+} from 'twenty-shared/timeline';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type FlatTimelineActivityType } from 'src/engine/metadata-modules/flat-timeline-activity-type/types/flat-timeline-activity-type.type';
+import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
+import { partitionTimelineActivityTypesByValidity } from 'src/engine/metadata-modules/timeline-activity-type/utils/is-valid-timeline-activity-type-override.util';
+import { resolveTimelineActivityTypeOverride } from 'src/engine/metadata-modules/timeline-activity-type/utils/resolve-timeline-activity-type-override.util';
+import { resolveTimelineActivityTypeRouting } from 'src/modules/timeline/utils/resolve-timeline-activity-type-routing.util';
+
+export type ResolvableTimelineActivityType = Pick<
+ FlatTimelineActivityType,
+ | 'id'
+ | 'applicationId'
+ | 'applicationUniversalIdentifier'
+ | 'universalIdentifier'
+ | 'name'
+ | 'label'
+ | 'action'
+ | 'icon'
+ | 'objectUniversalIdentifier'
+ | 'targetRelationFieldUniversalIdentifier'
+ | 'triggerFieldUniversalIdentifiers'
+ | 'frontComponentUniversalIdentifier'
+ | 'replacesTimelineActivityTypeUniversalIdentifier'
+ | 'isActive'
+ | 'overrides'
+>;
+
+export type TimelineActivityTypeResolutionMaps = {
+ byUniversalIdentifier: Partial<
+ Record<string, ResolvableTimelineActivityType>
+ >;
+ objectMetadataByUniversalIdentifier: Partial<
+ Record<string, { applicationUniversalIdentifier: string }>
+ >;
+};
+
+export type ResolveTimelineActivityTypeArgs = {
+ action: TimelineActivityAction;
+ objectUniversalIdentifier?: string | null;
+};
+
+export type ResolvedTimelineActivityType = {
+ id: string;
+ applicationId: string;
+ snapshot: TimelineActivityTypeSnapshot;
+};
+
+export type TimelineActivityTypeResolutionConflict = {
+ action: TimelineActivityAction;
+ objectUniversalIdentifier: string | null;
+};
+
+export type TimelineActivityTypeResolver = (
+ args: ResolveTimelineActivityTypeArgs,
+) => ResolvedTimelineActivityType | undefined;
+
+export type TimelineActivityTypeResolution = {
+ resolveTimelineActivityType: TimelineActivityTypeResolver;
+ effectiveTimelineActivityTypes: ResolvableTimelineActivityType[];
+ routingConflicts: TimelineActivityTypeResolutionConflict[];
+ resolverConflicts: TimelineActivityTypeResolutionConflict[];
+ invalidContracts: TimelineActivityTypeResolutionConflict[];
+};
+
+export const toResolvedTimelineActivityType = (
+ timelineActivityType: ResolvableTimelineActivityType,
+): ResolvedTimelineActivityType => ({
+ id: timelineActivityType.id,
+ applicationId: timelineActivityType.applicationId,
+ snapshot: {
+ id: timelineActivityType.id,
+ universalIdentifier: timelineActivityType.universalIdentifier,
+ name: timelineActivityType.name,
+ label: resolveOverridableEntityProperty(timelineActivityType, 'label'),
+ action: timelineActivityType.action,
+ icon: resolveOverridableEntityProperty(timelineActivityType, 'icon'),
+ objectUniversalIdentifier: timelineActivityType.objectUniversalIdentifier,
+ frontComponentUniversalIdentifier:
+ timelineActivityType.frontComponentUniversalIdentifier,
+ },
+});
+
+export const buildTimelineActivityTypeResolution = (
+ flatTimelineActivityTypeMaps: TimelineActivityTypeResolutionMaps,
+): TimelineActivityTypeResolution => {
+ const allUnvalidatedTimelineActivityTypes = Object.values(
+ flatTimelineActivityTypeMaps.byUniversalIdentifier,
+ ).filter(isDefined);
+ const timelineActivityTypeByUniversalIdentifier = Object.fromEntries(
+ allUnvalidatedTimelineActivityTypes.map((timelineActivityType) => [
+ timelineActivityType.universalIdentifier,
+ timelineActivityType,
+ ]),
+ );
+ const { validTimelineActivityTypes, invalidTimelineActivityTypes } =
+ partitionTimelineActivityTypesByValidity({
+ timelineActivityTypes: allUnvalidatedTimelineActivityTypes,
+ objectMetadataByUniversalIdentifier:
+ flatTimelineActivityTypeMaps.objectMetadataByUniversalIdentifier,
+ timelineActivityTypeByUniversalIdentifier,
+ });
+ const allTimelineActivityTypes = validTimelineActivityTypes.map(
+ (timelineActivityType) => {
+ const routing = resolveTimelineActivityTypeRouting(timelineActivityType);
+
+ return isDefined(routing)
+ ? { ...timelineActivityType, ...routing }
+ : timelineActivityType;
+ },
+ );
+ const allTimelineActivityTypeUniversalIdentifiers = new Set(
+ allTimelineActivityTypes.map(
+ (timelineActivityType) => timelineActivityType.universalIdentifier,
+ ),
+ );
+ const candidatesByEmitKey = new Map<
+ string,
+ ResolvableTimelineActivityType[]
+ >();
+
+ for (const timelineActivityType of allTimelineActivityTypes) {
+ if (!isDefined(timelineActivityType.action)) {
+ continue;
+ }
+
+ const emitKey = [
+ timelineActivityType.action,
+ timelineActivityType.objectUniversalIdentifier ?? 'ANY_OBJECT',
+ timelineActivityType.targetRelationFieldUniversalIdentifier ?? 'SELF',
+ ].join('|');
+
+ const candidates = candidatesByEmitKey.get(emitKey);
+
+ if (isDefined(candidates)) {
+ candidates.push(timelineActivityType);
+ } else {
+ candidatesByEmitKey.set(emitKey, [timelineActivityType]);
+ }
+ }
+
+ const effectiveTimelineActivityTypes: ResolvableTimelineActivityType[] = [];
+ const routingConflicts: TimelineActivityTypeResolutionConflict[] = [];
+ const resolverConflicts: TimelineActivityTypeResolutionConflict[] = [];
+ const conflictedObjectAndActionKeys = new Set<string>();
+
+ for (const candidates of candidatesByEmitKey.values()) {
+ const effectiveTimelineActivityType = resolveTimelineActivityTypeOverride(
+ candidates,
+ allTimelineActivityTypeUniversalIdentifiers,
+ );
+
+ if (isDefined(effectiveTimelineActivityType)) {
+ effectiveTimelineActivityTypes.push(effectiveTimelineActivityType);
+ continue;
+ }
+
+ const [candidate] = candidates;
+
+ if (!isDefined(candidate.action)) {
+ continue;
+ }
+
+ const conflict = {
+ action: candidate.action,
+ objectUniversalIdentifier: candidate.objectUniversalIdentifier,
+ };
+
+ if (isDefined(candidate.targetRelationFieldUniversalIdentifier)) {
+ routingConflicts.push(conflict);
+ continue;
+ }
+
+ resolverConflicts.push(conflict);
+
+ if (isDefined(conflict.objectUniversalIdentifier)) {
+ conflictedObjectAndActionKeys.add(
+ `${conflict.objectUniversalIdentifier}|${conflict.action}`,
+ );
+ }
+ }
+
+ const typeByAction = new Map<
+ TimelineActivityAction,
+ ResolvedTimelineActivityType
+ >();
+ const typeByObjectAndAction = new Map<string, ResolvedTimelineActivityType>();
+ const suppressedObjectAndActionKeys = new Set<string>();
+
+ for (const timelineActivityType of effectiveTimelineActivityTypes) {
+ const { action, objectUniversalIdentifier } = timelineActivityType;
+
+ if (
+ !isDefined(action) ||
+ isDefined(timelineActivityType.targetRelationFieldUniversalIdentifier)
+ ) {
+ continue;
+ }
+
+ if (!isDefined(objectUniversalIdentifier)) {
+ if (timelineActivityType.isActive) {
+ typeByAction.set(
+ action,
+ toResolvedTimelineActivityType(timelineActivityType),
+ );
+ }
+
+ continue;
+ }
+
+ const key = `${objectUniversalIdentifier}|${action}`;
+
+ if (timelineActivityType.isActive) {
+ typeByObjectAndAction.set(
+ key,
+ toResolvedTimelineActivityType(timelineActivityType),
+ );
+ } else {
+ suppressedObjectAndActionKeys.add(key);
+ }
+ }
+
+ const resolveTimelineActivityType = ({
+ action,
+ objectUniversalIdentifier,
+ }: ResolveTimelineActivityTypeArgs) => {
+ const objectAndActionKey = isDefined(objectUniversalIdentifier)
+ ? `${objectUniversalIdentifier}|${action}`
+ : undefined;
+
+ if (
+ isDefined(objectAndActionKey) &&
+ (conflictedObjectAndActionKeys.has(objectAndActionKey) ||
+ suppressedObjectAndActionKeys.has(objectAndActionKey))
+ ) {
+ return undefined;
+ }
+
+ return (
+ (isDefined(objectAndActionKey)
+ ? typeByObjectAndAction.get(objectAndActionKey)
+ : undefined) ?? typeByAction.get(action)
+ );
+ };
+
+ return {
+ resolveTimelineActivityType,
+ effectiveTimelineActivityTypes,
+ routingConflicts,
+ resolverConflicts,
+ invalidContracts: invalidTimelineActivityTypes.flatMap(
+ ({ action, objectUniversalIdentifier }) =>
+ isDefined(action) ? [{ action, objectUniversalIdentifier }] : [],
+ ),
+ };
+};
diff --git a/packages/twenty-server/test/integration/google/messaging/participant-matching-existing-person.integration-spec.ts b/packages/twenty-server/test/integration/google/messaging/participant-matching-existing-person.integration-spec.ts
index 8a5619a0967..9e3b555d60f 100644
--- a/packages/twenty-server/test/integration/google/messaging/participant-matching-existing-person.integration-spec.ts
+++ b/packages/twenty-server/test/integration/google/messaging/participant-matching-existing-person.integration-spec.ts
@@ -4,6 +4,8 @@ import {
ConnectedAccountProvider,
MessageChannelContactAutoCreationPolicy,
} from 'twenty-shared/types';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { type TimelineActivityTypeSnapshot } from 'twenty-shared/timeline';
import { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';
import { MessageChannelEntity } from 'src/engine/metadata-modules/message-channel/entities/message-channel.entity';
@@ -26,19 +28,46 @@ const HANDLE = '[email protected]';
const KNOWN_SENDER = `known-sender-${randomUUID()}@acme.com`;
const KNOWN_ATTENDEE = `known-attendee-${randomUUID()}@acme.com`;
-const findParticipantPersonIds = async (
+type ImportedParticipantLink<
+ TLinkedRecordIdField extends 'messageId' | 'calendarEventId',
+> = {
+ personId: string | null;
+} & Record<TLinkedRecordIdField, string>;
+
+const findParticipantLinks = async <
+ TLinkedRecordIdField extends 'messageId' | 'calendarEventId',
+>(
objectMetadataSingularName: string,
objectMetadataPluralName: string,
handle: string,
-) => {
- const participants = await findRecordNodesByFilter<{
- personId: string | null;
- }>(objectMetadataSingularName, objectMetadataPluralName, 'personId', {
- handle: { eq: handle },
- });
+ linkedRecordIdField: TLinkedRecordIdField,
+): Promise<ImportedParticipantLink<TLinkedRecordIdField>[]> =>
+ findRecordNodesByFilter<ImportedParticipantLink<TLinkedRecordIdField>>(
+ objectMetadataSingularName,
+ objectMetadataPluralName,
+ `personId ${linkedRecordIdField}`,
+ { handle: { eq: handle } },
+ );
- return participants.map((participant) => participant.personId);
-};
+const findLinkedTimelineActivities = async ({
+ personId,
+ linkedRecordId,
+}: {
+ personId: string;
+ linkedRecordId: string;
+}) =>
+ findRecordNodesByFilter<{
+ linkedRecordId: string;
+ timelineActivityTypeSnapshot: TimelineActivityTypeSnapshot;
+ }>(
+ 'timelineActivity',
+ 'timelineActivities',
+ 'linkedRecordId timelineActivityTypeSnapshot',
+ {
+ targetPersonId: { eq: personId },
+ linkedRecordId: { eq: linkedRecordId },
+ },
+ );
const createPerson = async (primaryEmail: string) => {
const response = await makeGraphqlAPIRequest(
@@ -109,23 +138,58 @@ describe('Participant matching when the person already exists (integration)', ()
await channel?.cleanup().catch(() => undefined);
});
- it('links the imported message participant to the person that already owned the handle', async () => {
- expect(
- await findParticipantPersonIds(
- 'messageParticipant',
- 'messageParticipants',
- KNOWN_SENDER,
- ),
- ).toEqual([senderPersonId]);
+ it('creates a typed timeline activity when importing an email for an existing person', async () => {
+ const participants = await findParticipantLinks(
+ 'messageParticipant',
+ 'messageParticipants',
+ KNOWN_SENDER,
+ 'messageId',
+ );
+ const [participant] = participants;
+
+ expect(participants).toHaveLength(1);
+ expect(participant.personId).toBe(senderPersonId);
+
+ const timelineActivities = await findLinkedTimelineActivities({
+ personId: senderPersonId,
+ linkedRecordId: participant.messageId,
+ });
+
+ expect(timelineActivities).toHaveLength(1);
+ expect(timelineActivities[0]).toMatchObject({
+ linkedRecordId: participant.messageId,
+ timelineActivityTypeSnapshot: {
+ action: 'linked',
+ objectUniversalIdentifier: STANDARD_OBJECTS.message.universalIdentifier,
+ },
+ });
}, 60000);
- it('links the imported calendar event participant to the person that already owned the handle', async () => {
- expect(
- await findParticipantPersonIds(
- 'calendarEventParticipant',
- 'calendarEventParticipants',
- KNOWN_ATTENDEE,
- ),
- ).toEqual([attendeePersonId]);
+ it('creates a typed timeline activity when importing a calendar event for an existing person', async () => {
+ const participants = await findParticipantLinks(
+ 'calendarEventParticipant',
+ 'calendarEventParticipants',
+ KNOWN_ATTENDEE,
+ 'calendarEventId',
+ );
+ const [participant] = participants;
+
+ expect(participants).toHaveLength(1);
+ expect(participant.personId).toBe(attendeePersonId);
+
+ const timelineActivities = await findLinkedTimelineActivities({
+ personId: attendeePersonId,
+ linkedRecordId: participant.calendarEventId,
+ });
+
+ expect(timelineActivities).toHaveLength(1);
+ expect(timelineActivities[0]).toMatchObject({
+ linkedRecordId: participant.calendarEventId,
+ timelineActivityTypeSnapshot: {
+ action: 'linked',
+ objectUniversalIdentifier:
+ STANDARD_OBJECTS.calendarEvent.universalIdentifier,
+ },
+ });
}, 60000);
});
diff --git a/packages/twenty-server/test/integration/graphql/suites/object-generated/people-merge-many.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-generated/people-merge-many.integration-spec.ts
index 55920a88ae8..9fe5671116f 100644
--- a/packages/twenty-server/test/integration/graphql/suites/object-generated/people-merge-many.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/object-generated/people-merge-many.integration-spec.ts
@@ -5,11 +5,50 @@ import { findOneOperationFactory } from 'test/integration/graphql/utils/find-one
import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
import { mergeManyOperationFactory } from 'test/integration/graphql/utils/merge-many-operation-factory.util';
import { deleteRecordsByIds } from 'test/integration/utils/delete-records-by-ids';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+import { gql } from 'graphql-tag';
+import { isDefined } from 'twenty-shared/utils';
import { type PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
+const FIND_CREATED_TIMELINE_ACTIVITY_TYPE = gql`
+ query FindCreatedTimelineActivityType {
+ timelineActivityTypes {
+ id
+ action
+ objectUniversalIdentifier
+ }
+ }
+`;
+
describe('people merge resolvers (integration)', () => {
let createdPersonIdsForCleaning: string[] = [];
+ let createdTimelineActivityTypeId: string;
+
+ beforeAll(async () => {
+ const response = await makeMetadataAPIRequest({
+ query: FIND_CREATED_TIMELINE_ACTIVITY_TYPE,
+ });
+
+ expect(response.body.errors).toBeUndefined();
+
+ const createdTimelineActivityType =
+ response.body.data.timelineActivityTypes.find(
+ ({
+ action,
+ objectUniversalIdentifier,
+ }: {
+ action: string | null;
+ objectUniversalIdentifier: string | null;
+ }) => action === 'created' && !isDefined(objectUniversalIdentifier),
+ );
+
+ if (!isDefined(createdTimelineActivityType)) {
+ throw new Error('Shared created timeline activity type is not installed');
+ }
+
+ createdTimelineActivityTypeId = createdTimelineActivityType.id;
+ });
afterEach(async () => {
if (createdPersonIdsForCleaning.length > 0) {
@@ -54,6 +93,7 @@ describe('people merge resolvers (integration)', () => {
gqlFields: 'id targetPersonId',
data: {
happensAt: new Date().toISOString(),
+ timelineActivityTypeId: createdTimelineActivityTypeId,
targetPersonId: duplicatePerson.id,
},
}),
diff --git a/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts
index 62011d89aa5..1b3b5c5fff6 100644
--- a/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/timeline/timeline-activity-write-path.integration-spec.ts
@@ -9,13 +9,16 @@ import { gql } from 'graphql-tag';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
import { waitForAllJobsToFinish } from 'test/integration/utils/wait-for-all-jobs-to-finish.util';
-import { type TimelineActivityAction } from 'twenty-shared/timeline';
+import {
+ type TimelineActivityAction,
+ type TimelineActivityTypeSnapshot,
+} from 'twenty-shared/timeline';
import { isDefined } from 'twenty-shared/utils';
const TIMELINE_ACTIVITY_GQL_FIELDS = `
id
- name
timelineActivityTypeId
+ timelineActivityTypeSnapshot
properties
linkedRecordId
linkedRecordCachedName
@@ -28,8 +31,8 @@ const TIMELINE_ACTIVITY_GQL_FIELDS = `
type TimelineActivityRow = {
id: string;
- name: string | null;
- timelineActivityTypeId: string | null;
+ timelineActivityTypeId: string;
+ timelineActivityTypeSnapshot: TimelineActivityTypeSnapshot;
properties: Record<string, unknown> | null;
linkedRecordId: string | null;
linkedRecordCachedName: string | null;
@@ -152,14 +155,24 @@ const timelineActivityTypeIdForOrThrow = (
};
const NOTE_UNIVERSAL_IDENTIFIER = STANDARD_OBJECTS.note.universalIdentifier;
+const MESSAGE_UNIVERSAL_IDENTIFIER =
+ STANDARD_OBJECTS.message.universalIdentifier;
+const CALENDAR_EVENT_UNIVERSAL_IDENTIFIER =
+ STANDARD_OBJECTS.calendarEvent.universalIdentifier;
const COMPANY_ID = '20202020-7171-4000-8000-000000000001';
const POSITION_COMPANY_ID = '20202020-7171-4000-8000-000000000002';
-const MERGE_COMPANY_ID = '20202020-7171-4000-8000-000000000003';
const NOTE_COMPANY_ID = '20202020-7171-4000-8000-000000000004';
const NOTE_ID = '20202020-7171-4000-8000-000000000005';
const NOTE_TARGET_ID = '20202020-7171-4000-8000-000000000006';
const MESSAGE_LIST_ID = '20202020-7171-4000-8000-000000000007';
+const ROUTED_PERSON_ID = '20202020-7171-4000-8000-000000000010';
+const ROUTED_MESSAGE_THREAD_ID = '20202020-7171-4000-8000-000000000011';
+const ROUTED_MESSAGE_ID = '20202020-7171-4000-8000-000000000012';
+const ROUTED_MESSAGE_PARTICIPANT_ID = '20202020-7171-4000-8000-000000000013';
+const ROUTED_CALENDAR_EVENT_ID = '20202020-7171-4000-8000-000000000014';
+const ROUTED_CALENDAR_EVENT_PARTICIPANT_ID =
+ '20202020-7171-4000-8000-000000000015';
const BATCH_COMPANY_IDS = [
'20202020-7171-4000-8000-000000000008',
'20202020-7171-4000-8000-000000000009',
@@ -167,6 +180,24 @@ const BATCH_COMPANY_IDS = [
const CREATED_RECORD_IDS: { objectMetadataSingularName: string; id: string }[] =
[
+ {
+ objectMetadataSingularName: 'calendarEventParticipant',
+ id: ROUTED_CALENDAR_EVENT_PARTICIPANT_ID,
+ },
+ {
+ objectMetadataSingularName: 'calendarEvent',
+ id: ROUTED_CALENDAR_EVENT_ID,
+ },
+ {
+ objectMetadataSingularName: 'messageParticipant',
+ id: ROUTED_MESSAGE_PARTICIPANT_ID,
+ },
+ { objectMetadataSingularName: 'message', id: ROUTED_MESSAGE_ID },
+ {
+ objectMetadataSingularName: 'messageThread',
+ id: ROUTED_MESSAGE_THREAD_ID,
+ },
+ { objectMetadataSingularName: 'person', id: ROUTED_PERSON_ID },
{ objectMetadataSingularName: 'noteTarget', id: NOTE_TARGET_ID },
{ objectMetadataSingularName: 'note', id: NOTE_ID },
{ objectMetadataSingularName: 'messageList', id: MESSAGE_LIST_ID },
@@ -175,14 +206,10 @@ const CREATED_RECORD_IDS: { objectMetadataSingularName: string; id: string }[] =
id,
})),
{ objectMetadataSingularName: 'company', id: NOTE_COMPANY_ID },
- { objectMetadataSingularName: 'company', id: MERGE_COMPANY_ID },
{ objectMetadataSingularName: 'company', id: POSITION_COMPANY_ID },
{ objectMetadataSingularName: 'company', id: COMPANY_ID },
];
-// Pins the write-path behavior that the timeline activity rule engine must
-// reproduce. Assertions describe what the hardcoded implementation does today,
-// including the parts that look accidental.
describe('timeline activity write path (integration)', () => {
beforeAll(async () => {
const response = await makeMetadataAPIRequest({
@@ -235,7 +262,10 @@ describe('timeline activity write path (integration)', () => {
expect(timelineActivities[0].timelineActivityTypeId).toBe(
timelineActivityTypeIdForOrThrow('created'),
);
- expect(timelineActivities[0].name).toBe('company.created');
+ expect(timelineActivities[0].timelineActivityTypeSnapshot).toMatchObject({
+ id: timelineActivityTypeIdForOrThrow('created'),
+ action: 'created',
+ });
expect(timelineActivities[0].targetCompanyId).toBe(COMPANY_ID);
expect(timelineActivities[0].linkedRecordId).toBeNull();
});
@@ -267,47 +297,6 @@ describe('timeline activity write path (integration)', () => {
});
});
- it('should merge two updates from the same author into a single entry', async () => {
- await createRecord({
- objectMetadataSingularName: 'company',
- data: {
- id: MERGE_COMPANY_ID,
- name: 'Merge Window',
- },
- });
-
- await updateRecord({
- objectMetadataSingularName: 'company',
- recordId: MERGE_COMPANY_ID,
- data: {
- name: 'Merge Window Once',
- },
- });
- await waitForAllJobsToFinish();
-
- await updateRecord({
- objectMetadataSingularName: 'company',
- recordId: MERGE_COMPANY_ID,
- data: {
- name: 'Merge Window Twice',
- },
- });
-
- const timelineActivities = await findTimelineActivities({
- targetCompanyId: { eq: MERGE_COMPANY_ID },
- timelineActivityTypeId: {
- eq: timelineActivityTypeIdForOrThrow('updated'),
- },
- });
-
- expect(timelineActivities).toHaveLength(1);
- expect(timelineActivities[0].properties).toEqual({
- diff: {
- name: { before: 'Merge Window', after: 'Merge Window Twice' },
- },
- });
- });
-
it('should merge every record of a multi record batch', async () => {
for (const [index, id] of BATCH_COMPANY_IDS.entries()) {
await createRecord({
@@ -411,6 +400,14 @@ describe('timeline activity write path (integration)', () => {
});
expect(timelineActivities).toHaveLength(1);
+ expect(timelineActivities[0].timelineActivityTypeSnapshot).toMatchObject({
+ id: timelineActivityTypeIdForOrThrow(
+ 'linked',
+ NOTE_UNIVERSAL_IDENTIFIER,
+ ),
+ action: 'linked',
+ objectUniversalIdentifier: NOTE_UNIVERSAL_IDENTIFIER,
+ });
expect(timelineActivities[0].linkedRecordId).toBe(NOTE_ID);
expect(timelineActivities[0].linkedRecordCachedName).toBe('Linked note');
expect(timelineActivities[0].linkedObjectMetadataId).not.toBeNull();
@@ -519,6 +516,124 @@ describe('timeline activity write path (integration)', () => {
});
});
+ describe('metadata-declared junction routing', () => {
+ it('should route message and calendar event links through the generic rule engine', async () => {
+ await createRecord({
+ objectMetadataSingularName: 'person',
+ data: {
+ id: ROUTED_PERSON_ID,
+ name: { firstName: 'Generic', lastName: 'Target' },
+ },
+ });
+ await createRecord({
+ objectMetadataSingularName: 'messageThread',
+ data: { id: ROUTED_MESSAGE_THREAD_ID },
+ });
+ await createRecord({
+ objectMetadataSingularName: 'message',
+ data: {
+ id: ROUTED_MESSAGE_ID,
+ messageThreadId: ROUTED_MESSAGE_THREAD_ID,
+ subject: 'Generic message routing',
+ text: 'No specialized listener required',
+ receivedAt: new Date().toISOString(),
+ },
+ });
+ await createRecord({
+ objectMetadataSingularName: 'messageParticipant',
+ data: {
+ id: ROUTED_MESSAGE_PARTICIPANT_ID,
+ messageId: ROUTED_MESSAGE_ID,
+ role: 'TO',
+ handle: '[email protected]',
+ displayName: 'Generic Target',
+ },
+ });
+ await updateRecord({
+ objectMetadataSingularName: 'messageParticipant',
+ recordId: ROUTED_MESSAGE_PARTICIPANT_ID,
+ data: { personId: ROUTED_PERSON_ID },
+ });
+
+ const messageActivities = await findTimelineActivities({
+ targetPersonId: { eq: ROUTED_PERSON_ID },
+ timelineActivityTypeId: {
+ eq: timelineActivityTypeIdForOrThrow(
+ 'linked',
+ MESSAGE_UNIVERSAL_IDENTIFIER,
+ ),
+ },
+ });
+
+ expect(messageActivities).toHaveLength(1);
+ expect(messageActivities[0]).toMatchObject({
+ linkedRecordId: ROUTED_MESSAGE_ID,
+ linkedRecordCachedName: 'Generic message routing',
+ });
+
+ await updateRecord({
+ objectMetadataSingularName: 'messageParticipant',
+ recordId: ROUTED_MESSAGE_PARTICIPANT_ID,
+ data: { handle: '[email protected]' },
+ });
+
+ expect(
+ await findTimelineActivities({
+ targetPersonId: { eq: ROUTED_PERSON_ID },
+ timelineActivityTypeId: {
+ eq: timelineActivityTypeIdForOrThrow(
+ 'linked',
+ MESSAGE_UNIVERSAL_IDENTIFIER,
+ ),
+ },
+ }),
+ ).toHaveLength(1);
+
+ await createRecord({
+ objectMetadataSingularName: 'calendarEvent',
+ data: {
+ id: ROUTED_CALENDAR_EVENT_ID,
+ title: 'Generic calendar routing',
+ isFullDay: false,
+ startsAt: new Date().toISOString(),
+ endsAt: new Date().toISOString(),
+ },
+ });
+ await createRecord({
+ objectMetadataSingularName: 'calendarEventParticipant',
+ data: {
+ id: ROUTED_CALENDAR_EVENT_PARTICIPANT_ID,
+ calendarEventId: ROUTED_CALENDAR_EVENT_ID,
+ handle: '[email protected]',
+ displayName: 'Generic Target',
+ responseStatus: 'ACCEPTED',
+ isOrganizer: false,
+ },
+ });
+ await updateRecord({
+ objectMetadataSingularName: 'calendarEventParticipant',
+ recordId: ROUTED_CALENDAR_EVENT_PARTICIPANT_ID,
+ data: { personId: ROUTED_PERSON_ID },
+ });
+
+ const calendarActivities = await findTimelineActivities({
+ targetPersonId: { eq: ROUTED_PERSON_ID },
+ timelineActivityTypeId: {
+ eq: timelineActivityTypeIdForOrThrow(
+ 'linked',
+ CALENDAR_EVENT_UNIVERSAL_IDENTIFIER,
+ ),
+ },
+ });
+
+ expect(calendarActivities).toHaveLength(1);
+ expect(calendarActivities[0]).toMatchObject({
+ linkedRecordId: ROUTED_CALENDAR_EVENT_ID,
+ linkedRecordCachedName: 'Generic calendar routing',
+ });
+ });
+ });
+
describe('system objects', () => {
it('should not write any entry for a system object outside the allowlist', async () => {
await createRecord({
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/build-base-manifest.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/build-base-manifest.util.ts
index fcf2283aa14..db083e030cc 100644
--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/build-base-manifest.util.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/build-base-manifest.util.ts
@@ -39,5 +39,6 @@ export const buildBaseManifest = ({
pageLayouts: [],
pageLayoutTabs: [],
commandMenuItems: [],
+ timelineActivityTypes: [],
...overrides,
});
diff --git a/packages/twenty-shared/src/application/enums/syncable-entities.enum.ts b/packages/twenty-shared/src/application/enums/syncable-entities.enum.ts
index 3b7b859b536..36f013cc6a0 100644
--- a/packages/twenty-shared/src/application/enums/syncable-entities.enum.ts
+++ b/packages/twenty-shared/src/application/enums/syncable-entities.enum.ts
@@ -13,4 +13,5 @@ export enum SyncableEntity {
PageLayout = 'pageLayout',
PageLayoutTab = 'pageLayoutTab',
CommandMenuItem = 'commandMenuItem',
+ TimelineActivityType = 'timelineActivityType',
}
diff --git a/packages/twenty-shared/src/application/index.ts b/packages/twenty-shared/src/application/index.ts
index 3dd550c7054..4b8260985ae 100644
--- a/packages/twenty-shared/src/application/index.ts
+++ b/packages/twenty-shared/src/application/index.ts
@@ -153,6 +153,11 @@ export type { SettingsFrontComponentApplicationManifest } from './settingsFrontC
export type { SkillManifest } from './skillManifestType';
export type { StoredOAuthConnectionProviderConfig } from './storedOAuthConnectionProviderConfigType';
export type { SyncableEntityOptions } from './syncableEntityOptionsType';
+export type {
+ TimelineActivityTypeEmitThroughManifest,
+ TimelineActivityTypeEmitManifest,
+ TimelineActivityTypeManifest,
+} from './timelineActivityTypeManifestType';
export type { ToolTriggerSettings } from './toolTriggerSettingsType';
export type { UninstallLogicFunctionApplicationManifest } from './uninstallLogicFunctionApplicationType';
export {
diff --git a/packages/twenty-shared/src/application/manifestType.ts b/packages/twenty-shared/src/application/manifestType.ts
index 7b5ea91b72b..b73b5b638e9 100644
--- a/packages/twenty-shared/src/application/manifestType.ts
+++ b/packages/twenty-shared/src/application/manifestType.ts
@@ -20,6 +20,7 @@ import {
import { type PermissionFlagManifest } from './permissionFlagManifestType';
import { type RoleManifest } from './roleManifestType';
import { type SkillManifest } from './skillManifestType';
+import { type TimelineActivityTypeManifest } from './timelineActivityTypeManifestType';
import {
type StandaloneViewFieldManifest,
type ViewManifest,
@@ -48,5 +49,6 @@ export type Manifest = {
pageLayouts: PageLayoutManifest[];
pageLayoutTabs: PageLayoutTabManifest[];
commandMenuItems: CommandMenuItemManifest[];
+ timelineActivityTypes: TimelineActivityTypeManifest[];
translations?: TranslationsManifest;
};
diff --git a/packages/twenty-shared/src/application/timelineActivityTypeManifestType.ts b/packages/twenty-shared/src/application/timelineActivityTypeManifestType.ts
new file mode 100644
index 00000000000..ae9d2144ea0
--- /dev/null
+++ b/packages/twenty-shared/src/application/timelineActivityTypeManifestType.ts
@@ -0,0 +1,23 @@
+import { type TimelineActivityAction } from '@/timeline';
+
+import { type SyncableEntityOptions } from './syncableEntityOptionsType';
+
+export type TimelineActivityTypeEmitThroughManifest = {
+ relationFieldUniversalIdentifier: string;
+ triggerFieldUniversalIdentifiers?: string[];
+};
+
+export type TimelineActivityTypeEmitManifest = {
+ on: TimelineActivityAction;
+ objectUniversalIdentifier: string;
+ through?: TimelineActivityTypeEmitThroughManifest;
+};
+
+export type TimelineActivityTypeManifest = SyncableEntityOptions & {
+ name: string;
+ label: string;
+ icon?: string;
+ emit?: TimelineActivityTypeEmitManifest;
+ frontComponentUniversalIdentifier?: string;
+ replacesTimelineActivityTypeUniversalIdentifier?: string;
+};
diff --git a/packages/twenty-shared/src/constants/DocumentationPaths.ts b/packages/twenty-shared/src/constants/DocumentationPaths.ts
index 8b7c520b792..c8f5d95c353 100644
--- a/packages/twenty-shared/src/constants/DocumentationPaths.ts
+++ b/packages/twenty-shared/src/constants/DocumentationPaths.ts
@@ -34,6 +34,8 @@ export const DOCUMENTATION_PATHS = {
'/developers/extend/apps/data/relations',
DEVELOPERS_EXTEND_APPS_DATA_SYSTEM_FIELDS:
'/developers/extend/apps/data/system-fields',
+ DEVELOPERS_EXTEND_APPS_DATA_TIMELINE_ACTIVITY_TYPES:
+ '/developers/extend/apps/data/timeline-activity-types',
DEVELOPERS_EXTEND_APPS_GETTING_STARTED_CONCEPTS:
'/developers/extend/apps/getting-started/concepts',
DEVELOPERS_EXTEND_APPS_GETTING_STARTED_LOCAL_SERVER:
diff --git a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
index 032ff568b23..04d864b54c4 100644
--- a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
+++ b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
@@ -2650,6 +2650,9 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e
"timelineActivityTypeId": {
"universalIdentifier": "20202020-e5f8-4839-9dcf-781e260624ee",
},
+ "timelineActivityTypeSnapshot": {
+ "universalIdentifier": "20202020-e006-493a-9b07-f2a768a204ca",
+ },
"updatedAt": {
"universalIdentifier": "01b33b31-f011-5b55-942f-5bf3ec56f9b3",
},
diff --git a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts
index ef92d30cf3a..e66d2e76119 100644
--- a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts
+++ b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts
@@ -28,6 +28,9 @@ export const STANDARD_OBJECT_FIELDS = {
timelineActivityTypeId: {
universalIdentifier: '20202020-e5f8-4839-9dcf-781e260624ee',
},
+ timelineActivityTypeSnapshot: {
+ universalIdentifier: '20202020-e006-493a-9b07-f2a768a204ca',
+ },
happensAt: {
universalIdentifier: '20202020-9526-4993-b339-c4318c4d39f0',
},
diff --git a/packages/twenty-shared/src/timeline/StandardTimelineActivityRendererUniversalIdentifier.ts b/packages/twenty-shared/src/timeline/StandardTimelineActivityRendererUniversalIdentifier.ts
new file mode 100644
index 00000000000..663e8d8fb00
--- /dev/null
+++ b/packages/twenty-shared/src/timeline/StandardTimelineActivityRendererUniversalIdentifier.ts
@@ -0,0 +1,14 @@
+export const STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS = {
+ message: '8b4da8ed-4a87-480d-bcad-a791262cb890',
+ calendarEvent: '3c70dd28-42f3-41da-8f41-22013d65ff50',
+} as const;
+
+export type StandardTimelineActivityRendererUniversalIdentifier =
+ (typeof STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS)[keyof typeof STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS];
+
+export const isStandardTimelineActivityRendererUniversalIdentifier = (
+ value: string,
+): value is StandardTimelineActivityRendererUniversalIdentifier =>
+ Object.values(
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS,
+ ).includes(value as StandardTimelineActivityRendererUniversalIdentifier);
diff --git a/packages/twenty-shared/src/timeline/TimelineActivityRenderer.ts b/packages/twenty-shared/src/timeline/TimelineActivityRenderer.ts
deleted file mode 100644
index 8a7b10dd6b8..00000000000
--- a/packages/twenty-shared/src/timeline/TimelineActivityRenderer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { isDefined } from '@/utils/validation';
-
-// The frontend components a timeline row can be drawn with. A type names one so
-// the row is chosen by metadata rather than by branching on the linked object.
-export const TIMELINE_ACTIVITY_RENDERERS = [
- 'mainObject',
- 'genericLinked',
- 'activity',
- 'message',
- 'calendarEvent',
-] as const;
-
-export type TimelineActivityRenderer =
- (typeof TIMELINE_ACTIVITY_RENDERERS)[number];
-
-export const isTimelineActivityRenderer = (
- value: string | null | undefined,
-): value is TimelineActivityRenderer =>
- isDefined(value) &&
- (TIMELINE_ACTIVITY_RENDERERS as readonly string[]).includes(value);
diff --git a/packages/twenty-shared/src/timeline/TimelineActivityTypeSnapshot.ts b/packages/twenty-shared/src/timeline/TimelineActivityTypeSnapshot.ts
new file mode 100644
index 00000000000..50c02d9e2dc
--- /dev/null
+++ b/packages/twenty-shared/src/timeline/TimelineActivityTypeSnapshot.ts
@@ -0,0 +1,12 @@
+import { type TimelineActivityAction } from './TimelineActivityAction';
+
+export type TimelineActivityTypeSnapshot = {
+ id: string;
+ universalIdentifier: string;
+ name: string;
+ label: string;
+ action: TimelineActivityAction | null;
+ icon: string | null;
+ objectUniversalIdentifier: string | null;
+ frontComponentUniversalIdentifier: string | null;
+};
diff --git a/packages/twenty-shared/src/timeline/__tests__/isStandardTimelineActivityRendererUniversalIdentifier.spec.ts b/packages/twenty-shared/src/timeline/__tests__/isStandardTimelineActivityRendererUniversalIdentifier.spec.ts
new file mode 100644
index 00000000000..4ddafb7590f
--- /dev/null
+++ b/packages/twenty-shared/src/timeline/__tests__/isStandardTimelineActivityRendererUniversalIdentifier.spec.ts
@@ -0,0 +1,24 @@
+import {
+ isStandardTimelineActivityRendererUniversalIdentifier,
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS,
+} from '../StandardTimelineActivityRendererUniversalIdentifier';
+
+describe('isStandardTimelineActivityRendererUniversalIdentifier', () => {
+ it.each(
+ Object.values(STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS),
+ )('accepts %s', (universalIdentifier) => {
+ expect(
+ isStandardTimelineActivityRendererUniversalIdentifier(
+ universalIdentifier,
+ ),
+ ).toBe(true);
+ });
+
+ it('rejects an unknown identifier', () => {
+ expect(
+ isStandardTimelineActivityRendererUniversalIdentifier(
+ '00000000-0000-4000-8000-000000000001',
+ ),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-shared/src/timeline/index.ts b/packages/twenty-shared/src/timeline/index.ts
index f8d4a6d7813..1cae1e094a7 100644
--- a/packages/twenty-shared/src/timeline/index.ts
+++ b/packages/twenty-shared/src/timeline/index.ts
@@ -8,13 +8,14 @@
*/
export { parseTimelineActivityAction } from './parseTimelineActivityAction';
+export type { StandardTimelineActivityRendererUniversalIdentifier } from './StandardTimelineActivityRendererUniversalIdentifier';
+export {
+ STANDARD_TIMELINE_ACTIVITY_RENDERER_UNIVERSAL_IDENTIFIERS,
+ isStandardTimelineActivityRendererUniversalIdentifier,
+} from './StandardTimelineActivityRendererUniversalIdentifier';
export type { TimelineActivityAction } from './TimelineActivityAction';
export {
TIMELINE_ACTIVITY_ACTIONS,
isTimelineActivityAction,
} from './TimelineActivityAction';
-export type { TimelineActivityRenderer } from './TimelineActivityRenderer';
-export {
- TIMELINE_ACTIVITY_RENDERERS,
- isTimelineActivityRenderer,
-} from './TimelineActivityRenderer';
+export type { TimelineActivityTypeSnapshot } from './TimelineActivityTypeSnapshot';
diff --git a/packages/twenty-shared/src/utils/index.ts b/packages/twenty-shared/src/utils/index.ts
index ec022fdefc5..6ddf1f27bdb 100644
--- a/packages/twenty-shared/src/utils/index.ts
+++ b/packages/twenty-shared/src/utils/index.ts
@@ -199,6 +199,7 @@ export {
} from './image/getLogoUrlFromDomainName';
export { getUniqueConstraintsFields } from './indexMetadata/getUniqueConstraintsFields';
export { isAutoSelectModelId } from './isAutoSelectModelId';
+export { isFieldValueRestricted } from './isFieldValueRestricted';
export { fastDeepEqual } from './json/fast-deep-equal';
export { getAppPath } from './navigation/getAppPath';
export { getSettingsPath } from './navigation/getSettingsPath';
diff --git a/packages/twenty-shared/src/utils/isFieldValueRestricted.ts b/packages/twenty-shared/src/utils/isFieldValueRestricted.ts
new file mode 100644
index 00000000000..39a4b57ec72
--- /dev/null
+++ b/packages/twenty-shared/src/utils/isFieldValueRestricted.ts
@@ -0,0 +1,4 @@
+import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from '../constants/FieldRestrictedAdditionalPermissionsRequired';
+
+export const isFieldValueRestricted = (value: unknown): boolean =>
+ value === FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED;