Skip to content

The open alternative to Salesforce, designed for AI.

Let users choose whether to import private calendar events (#28248)

neo773dd7099a02f83
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 30fc87d8ab0..35f5a8823da 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -956,6 +956,7 @@ type CalendarChannel {
connectedAccountId: UUID!
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy!
createdAt: DateTime!
+ excludePrivateEvents: Boolean!
handle: String!
id: UUID!
isContactAutoCreationEnabled: Boolean!
@@ -4704,6 +4705,7 @@ input UpdateCalendarChannelInput {
input UpdateCalendarChannelInputUpdates {
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy
+ excludePrivateEvents: Boolean
isContactAutoCreationEnabled: Boolean
isSyncEnabled: Boolean
visibility: CalendarChannelVisibility
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 35505347187..c7b8d5751d1 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -856,6 +856,7 @@ export interface CalendarChannel {
connectedAccountId: Scalars['UUID']
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy
createdAt: Scalars['DateTime']
+ excludePrivateEvents: Scalars['Boolean']
handle: Scalars['String']
id: Scalars['UUID']
isContactAutoCreationEnabled: Scalars['Boolean']
@@ -4883,6 +4884,7 @@ export interface CalendarChannelGenqlSelection{
connectedAccountId?: boolean | number
contactAutoCreationPolicy?: boolean | number
createdAt?: boolean | number
+ excludePrivateEvents?: boolean | number
handle?: boolean | number
id?: boolean | number
isContactAutoCreationEnabled?: boolean | number
@@ -7776,7 +7778,7 @@ export interface UpdateApplicationRegistrationVariablePayload {description?: (Sc
export interface UpdateCalendarChannelInput {id: Scalars['UUID'],update: UpdateCalendarChannelInputUpdates}
-export interface UpdateCalendarChannelInputUpdates {contactAutoCreationPolicy?: (CalendarChannelContactAutoCreationPolicy | null),isContactAutoCreationEnabled?: (Scalars['Boolean'] | null),isSyncEnabled?: (Scalars['Boolean'] | null),visibility?: (CalendarChannelVisibility | null)}
+export interface UpdateCalendarChannelInputUpdates {contactAutoCreationPolicy?: (CalendarChannelContactAutoCreationPolicy | null),excludePrivateEvents?: (Scalars['Boolean'] | null),isContactAutoCreationEnabled?: (Scalars['Boolean'] | null),isSyncEnabled?: (Scalars['Boolean'] | null),visibility?: (CalendarChannelVisibility | null)}
export interface UpdateCommandMenuItemInput {availabilityObjectMetadataId?: (Scalars['UUID'] | null),availabilityType?: (CommandMenuItemAvailabilityType | null),engineComponentKey?: (EngineComponentKey | null),hotKeys?: (Scalars['String'][] | null),icon?: (Scalars['String'] | null),id: Scalars['UUID'],isPinned?: (Scalars['Boolean'] | null),label?: (Scalars['String'] | null),pageLayoutId?: (Scalars['UUID'] | null),position?: (Scalars['Float'] | null),shortLabel?: (Scalars['String'] | null)}
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index 1f87fe68bb9..4731245e637 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -2082,6 +2082,9 @@ export default {
"createdAt": [
190
],
+ "excludePrivateEvents": [
+ 4
+ ],
"handle": [
1
],
@@ -12462,6 +12465,9 @@ export default {
"contactAutoCreationPolicy": [
111
],
+ "excludePrivateEvents": [
+ 4
+ ],
"isContactAutoCreationEnabled": [
4
],
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index aad708c36ff..0b7764a4c48 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -1044,6 +1044,7 @@ export type CalendarChannel = {
connectedAccountId: Scalars['UUID']['output'];
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy;
createdAt: Scalars['DateTime']['output'];
+ excludePrivateEvents: Scalars['Boolean']['output'];
handle: Scalars['String']['output'];
id: Scalars['UUID']['output'];
isContactAutoCreationEnabled: Scalars['Boolean']['output'];
@@ -6873,6 +6874,7 @@ export type UpdateCalendarChannelInput = {
export type UpdateCalendarChannelInputUpdates = {
contactAutoCreationPolicy?: InputMaybe<CalendarChannelContactAutoCreationPolicy>;
+ excludePrivateEvents?: InputMaybe<Scalars['Boolean']['input']>;
isContactAutoCreationEnabled?: InputMaybe<Scalars['Boolean']['input']>;
isSyncEnabled?: InputMaybe<Scalars['Boolean']['input']>;
visibility?: InputMaybe<CalendarChannelVisibility>;
@@ -9806,7 +9808,7 @@ export type UpdateCalendarChannelMutationVariables = Exact<{
}>;
-export type UpdateCalendarChannelMutation = { __typename?: 'Mutation', updateCalendarChannel: { __typename?: 'CalendarChannel', id: string, visibility: CalendarChannelVisibility, isContactAutoCreationEnabled: boolean, contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy } };
+export type UpdateCalendarChannelMutation = { __typename?: 'Mutation', updateCalendarChannel: { __typename?: 'CalendarChannel', id: string, visibility: CalendarChannelVisibility, isContactAutoCreationEnabled: boolean, contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy, excludePrivateEvents: boolean } };
export type UpdateEmailGroupChannelMutationVariables = Exact<{
input: UpdateEmailGroupChannelInput;
@@ -9841,7 +9843,7 @@ export type MyCalendarChannelsQueryVariables = Exact<{
}>;
-export type MyCalendarChannelsQuery = { __typename?: 'Query', myCalendarChannels: Array<{ __typename?: 'CalendarChannel', id: string, handle: string, visibility: CalendarChannelVisibility, syncStatus: CalendarChannelSyncStatus, syncStage: CalendarChannelSyncStage, syncStageStartedAt?: string | null, isContactAutoCreationEnabled: boolean, contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy, isSyncEnabled: boolean, connectedAccountId: string, createdAt: string, updatedAt: string }> };
+export type MyCalendarChannelsQuery = { __typename?: 'Query', myCalendarChannels: Array<{ __typename?: 'CalendarChannel', id: string, handle: string, visibility: CalendarChannelVisibility, syncStatus: CalendarChannelSyncStatus, syncStage: CalendarChannelSyncStage, syncStageStartedAt?: string | null, isContactAutoCreationEnabled: boolean, contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy, excludePrivateEvents: boolean, isSyncEnabled: boolean, connectedAccountId: string, createdAt: string, updatedAt: string }> };
export type MyConnectedAccountsQueryVariables = Exact<{ [key: string]: never; }>;
@@ -11159,12 +11161,12 @@ export const DeleteEmailGroupChannelDocument = {"kind":"Document","definitions":
export const DisconnectConnectedAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DisconnectConnectedAccount"},"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":"disconnectConnectedAccount"},"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"}}]}}]}}]} as unknown as DocumentNode<DisconnectConnectedAccountMutation, DisconnectConnectedAccountMutationVariables>;
export const SaveImapSmtpCaldavAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SaveImapSmtpCaldavAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"handle"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectionParameters"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"EmailAccountConnectionParameters"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"saveImapSmtpCaldavAccount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"handle"},"value":{"kind":"Variable","name":{"kind":"Name","value":"handle"}}},{"kind":"Argument","name":{"kind":"Name","value":"connectionParameters"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectionParameters"}}},{"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":"success"}},{"kind":"Field","name":{"kind":"Name","value":"connectedAccountId"}}]}}]}}]} as unknown as DocumentNode<SaveImapSmtpCaldavAccountMutation, SaveImapSmtpCaldavAccountMutationVariables>;
export const StartChannelSyncDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"StartChannelSync"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"startChannelSync"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}}]}}]} as unknown as DocumentNode<StartChannelSyncMutation, StartChannelSyncMutationVariables>;
-export const UpdateCalendarChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateCalendarChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCalendarChannelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateCalendarChannel"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"isContactAutoCreationEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}}]}}]}}]} as unknown as DocumentNode<UpdateCalendarChannelMutation, UpdateCalendarChannelMutationVariables>;
+export const UpdateCalendarChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateCalendarChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCalendarChannelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateCalendarChannel"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"isContactAutoCreationEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"excludePrivateEvents"}}]}}]}}]} as unknown as DocumentNode<UpdateCalendarChannelMutation, UpdateCalendarChannelMutationVariables>;
export const UpdateEmailGroupChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateEmailGroupChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateEmailGroupChannelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateEmailGroupChannel"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}}]}}]}}]} as unknown as DocumentNode<UpdateEmailGroupChannelMutation, UpdateEmailGroupChannelMutationVariables>;
export const UpdateMessageChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateMessageChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateMessageChannelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateMessageChannel"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"excludeNonProfessionalEmails"}},{"kind":"Field","name":{"kind":"Name","value":"excludeGroupEmails"}},{"kind":"Field","name":{"kind":"Name","value":"messageFolderImportPolicy"}}]}}]}}]} as unknown as DocumentNode<UpdateMessageChannelMutation, UpdateMessageChannelMutationVariables>;
export const UpdateMessageFoldersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateMessageFolders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateMessageFoldersInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateMessageFolders"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isSynced"}},{"kind":"Field","name":{"kind":"Name","value":"pendingSyncAction"}}]}}]}}]} as unknown as DocumentNode<UpdateMessageFoldersMutation, UpdateMessageFoldersMutationVariables>;
export const GetConnectedImapSmtpCaldavAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetConnectedImapSmtpCaldavAccount"},"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":"getConnectedImapSmtpCaldavAccount"},"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":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"provider"}},{"kind":"Field","name":{"kind":"Name","value":"userWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"connectionParameters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"IMAP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"connectionSecurity"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}},{"kind":"Field","name":{"kind":"Name","value":"SMTP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"connectionSecurity"}}]}},{"kind":"Field","name":{"kind":"Name","value":"CALDAV"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"connectionSecurity"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}}]}}]}}]}}]} as unknown as DocumentNode<GetConnectedImapSmtpCaldavAccountQuery, GetConnectedImapSmtpCaldavAccountQueryVariables>;
-export const MyCalendarChannelsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyCalendarChannels"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myCalendarChannels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"syncStage"}},{"kind":"Field","name":{"kind":"Name","value":"syncStageStartedAt"}},{"kind":"Field","name":{"kind":"Name","value":"isContactAutoCreationEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"isSyncEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"connectedAccountId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<MyCalendarChannelsQuery, MyCalendarChannelsQueryVariables>;
+export const MyCalendarChannelsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyCalendarChannels"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myCalendarChannels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"syncStage"}},{"kind":"Field","name":{"kind":"Name","value":"syncStageStartedAt"}},{"kind":"Field","name":{"kind":"Name","value":"isContactAutoCreationEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"excludePrivateEvents"}},{"kind":"Field","name":{"kind":"Name","value":"isSyncEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"connectedAccountId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<MyCalendarChannelsQuery, MyCalendarChannelsQueryVariables>;
export const MyConnectedAccountsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyConnectedAccounts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myConnectedAccounts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"provider"}},{"kind":"Field","name":{"kind":"Name","value":"authFailedAt"}},{"kind":"Field","name":{"kind":"Name","value":"authFailedReason"}},{"kind":"Field","name":{"kind":"Name","value":"archivedAt"}},{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"handleAliases"}},{"kind":"Field","name":{"kind":"Name","value":"lastSignedInAt"}},{"kind":"Field","name":{"kind":"Name","value":"userWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"connectionProviderId"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"scope"}},{"kind":"Field","name":{"kind":"Name","value":"lastCredentialsRefreshedAt"}},{"kind":"Field","name":{"kind":"Name","value":"connectionParameters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"IMAP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"connectionSecurity"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}},{"kind":"Field","name":{"kind":"Name","value":"SMTP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"connectionSecurity"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}},{"kind":"Field","name":{"kind":"Name","value":"CALDAV"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<MyConnectedAccountsQuery, MyConnectedAccountsQueryVariables>;
export const MyMessageChannelsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyMessageChannels"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myMessageChannels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"isContactAutoCreationEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"messageFolderImportPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"excludeNonProfessionalEmails"}},{"kind":"Field","name":{"kind":"Name","value":"excludeGroupEmails"}},{"kind":"Field","name":{"kind":"Name","value":"isSyncEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"syncStage"}},{"kind":"Field","name":{"kind":"Name","value":"syncStageStartedAt"}},{"kind":"Field","name":{"kind":"Name","value":"importProgress"}},{"kind":"Field","name":{"kind":"Name","value":"connectedAccountId"}},{"kind":"Field","name":{"kind":"Name","value":"connectedAccount"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<MyMessageChannelsQuery, MyMessageChannelsQueryVariables>;
export const MyMessageFoldersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyMessageFolders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"messageChannelId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myMessageFolders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"messageChannelId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"messageChannelId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"isSynced"}},{"kind":"Field","name":{"kind":"Name","value":"isSentFolder"}},{"kind":"Field","name":{"kind":"Name","value":"parentFolderId"}},{"kind":"Field","name":{"kind":"Name","value":"externalId"}},{"kind":"Field","name":{"kind":"Name","value":"pendingSyncAction"}},{"kind":"Field","name":{"kind":"Name","value":"messageChannelId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<MyMessageFoldersQuery, MyMessageFoldersQueryVariables>;
diff --git a/packages/twenty-front/src/modules/accounts/types/CalendarChannel.ts b/packages/twenty-front/src/modules/accounts/types/CalendarChannel.ts
index 0cf315ecdba..201ff67328e 100644
--- a/packages/twenty-front/src/modules/accounts/types/CalendarChannel.ts
+++ b/packages/twenty-front/src/modules/accounts/types/CalendarChannel.ts
@@ -11,6 +11,7 @@ export type CalendarChannel = {
visibility: CalendarChannelVisibility;
isContactAutoCreationEnabled: boolean;
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy;
+ excludePrivateEvents: boolean;
isSyncEnabled: boolean;
syncStatus: CalendarChannelSyncStatus;
syncStage: CalendarChannelSyncStage;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
index 7c4c3bacfc3..2f3f4fef00d 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelDetails.tsx
@@ -6,7 +6,7 @@ import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsO
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { Section } from 'twenty-ui/components/layout';
-import { IconUserPlus } from 'twenty-ui/icon';
+import { IconEyeOff, IconUserPlus } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme';
import { type CalendarChannelVisibility } from '~/generated-metadata/graphql';
@@ -20,7 +20,11 @@ const StyledDetailsContainer = styled.div`
type SettingsAccountsCalendarChannelDetailsProps = {
calendarChannel: Pick<
CalendarChannel,
- 'id' | 'visibility' | 'isContactAutoCreationEnabled' | 'isSyncEnabled'
+ | 'id'
+ | 'visibility'
+ | 'isContactAutoCreationEnabled'
+ | 'excludePrivateEvents'
+ | 'isSyncEnabled'
>;
};
@@ -43,6 +47,10 @@ export const SettingsAccountsCalendarChannelDetails = ({
updateChannel({ isContactAutoCreationEnabled: value });
};
+ const handleIsPrivateEventExcludedToggle = (value: boolean) => {
+ updateChannel({ excludePrivateEvents: value });
+ };
+
return (
<StyledDetailsContainer>
<Section.Root>
@@ -74,6 +82,25 @@ export const SettingsAccountsCalendarChannelDetails = ({
/>
</Card.Root>
</Section.Root>
+ <Section.Root>
+ <Section.Header
+ title={t`Options`}
+ description={t`Configure what events should get synced`}
+ />
+ <Card.Root rounded>
+ <SettingsOptionCardContentSwitch
+ Icon={IconEyeOff}
+ title={t`Exclude private events`}
+ description={t`Don't import events marked as private`}
+ checked={calendarChannel.excludePrivateEvents}
+ onChange={() =>
+ handleIsPrivateEventExcludedToggle(
+ !calendarChannel.excludePrivateEvents,
+ )
+ }
+ />
+ </Card.Root>
+ </Section.Root>
</StyledDetailsContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx
index 22a7b1a95f8..d50ebecca1b 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx
@@ -19,6 +19,7 @@ const meta: Meta<typeof SettingsAccountsCalendarChannelDetails> = {
calendarChannel: {
id: '20202020-ef5a-4822-9e08-ce6e6a4dcb6a',
isContactAutoCreationEnabled: true,
+ excludePrivateEvents: false,
isSyncEnabled: true,
visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
},
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/mockedDropdownConnectedAccount.ts b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/mockedDropdownConnectedAccount.ts
index 1c04ad70129..93a2c4d1917 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/mockedDropdownConnectedAccount.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/mockedDropdownConnectedAccount.ts
@@ -34,6 +34,7 @@ export const mockedDropdownConnectedAccount: ConnectedAccount = {
visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
isContactAutoCreationEnabled: false,
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy.NONE,
+ excludePrivateEvents: false,
isSyncEnabled: true,
syncStatus: CalendarChannelSyncStatus.NOT_SYNCED,
syncStage: CalendarChannelSyncStage.PENDING_CONFIGURATION,
diff --git a/packages/twenty-front/src/modules/settings/accounts/graphql/mutations/updateCalendarChannel.ts b/packages/twenty-front/src/modules/settings/accounts/graphql/mutations/updateCalendarChannel.ts
index 62d15120469..250bfb8dae5 100644
--- a/packages/twenty-front/src/modules/settings/accounts/graphql/mutations/updateCalendarChannel.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/graphql/mutations/updateCalendarChannel.ts
@@ -7,6 +7,7 @@ export const UPDATE_CALENDAR_CHANNEL = gql`
visibility
isContactAutoCreationEnabled
contactAutoCreationPolicy
+ excludePrivateEvents
}
}
`;
diff --git a/packages/twenty-front/src/modules/settings/accounts/graphql/queries/getMyCalendarChannels.ts b/packages/twenty-front/src/modules/settings/accounts/graphql/queries/getMyCalendarChannels.ts
index 590b69cf078..dc982414776 100644
--- a/packages/twenty-front/src/modules/settings/accounts/graphql/queries/getMyCalendarChannels.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/graphql/queries/getMyCalendarChannels.ts
@@ -11,6 +11,7 @@ export const GET_MY_CALENDAR_CHANNELS = gql`
syncStageStartedAt
isContactAutoCreationEnabled
contactAutoCreationPolicy
+ excludePrivateEvents
isSyncEnabled
connectedAccountId
createdAt
diff --git a/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx
index eb247ce8de0..21d88bb49b1 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/__stories__/SidePanelComposerPages.stories.tsx
@@ -77,6 +77,7 @@ const storyCalendarChannels = storyConnectedAccounts.map((account, index) => ({
visibility: 'SHARE_EVERYTHING',
isContactAutoCreationEnabled: false,
contactAutoCreationPolicy: 'AS_PARTICIPANT_AND_ORGANIZER',
+ excludePrivateEvents: false,
isSyncEnabled: true,
syncStatus: 'ACTIVE',
syncStage: 'CALENDAR_EVENTS_IMPORT_ONGOING',
diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx
index f866901c24e..3aa2c445ca0 100644
--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsCalendars.stories.tsx
@@ -76,6 +76,7 @@ export const TwoConnectedAccounts: Story = {
visibility: 'SHARE_EVERYTHING',
contactAutoCreationPolicy: 'SENT',
isContactAutoCreationEnabled: true,
+ excludePrivateEvents: false,
createdAt: '2024-07-03T20:03:11.903Z',
updatedAt: '2024-07-03T20:03:11.903Z',
},
@@ -89,6 +90,7 @@ export const TwoConnectedAccounts: Story = {
visibility: 'SHARE_EVERYTHING',
contactAutoCreationPolicy: 'SENT',
isContactAutoCreationEnabled: true,
+ excludePrivateEvents: false,
createdAt: '2024-07-03T20:03:11.903Z',
updatedAt: '2024-07-03T20:03:11.903Z',
},
diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedAccountGroups.ts b/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedAccountGroups.ts
index 72153735d43..8c93be68b34 100644
--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedAccountGroups.ts
+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/mockedAccountGroups.ts
@@ -97,6 +97,7 @@ const buildCalendarChannel = (id: string, connectedAccountId: string) => ({
visibility: 'SHARE_EVERYTHING',
isContactAutoCreationEnabled: false,
contactAutoCreationPolicy: 'AS_PARTICIPANT_AND_ORGANIZER',
+ excludePrivateEvents: false,
isSyncEnabled: true,
syncStatus: 'ACTIVE',
syncStage: 'CALENDAR_EVENT_LIST_FETCH_PENDING',
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-instance-command-fast-1792319637000-add-exclude-private-events-to-calendar-channel.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-instance-command-fast-1792319637000-add-exclude-private-events-to-calendar-channel.ts
new file mode 100644
index 00000000000..b213bee43fd
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-49/2-49-instance-command-fast-1792319637000-add-exclude-private-events-to-calendar-channel.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.49.0', 1792319637000)
+export class AddExcludePrivateEventsToCalendarChannelFastInstanceCommand implements FastInstanceCommand {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ 'ALTER TABLE "core"."calendarChannel" ADD "excludePrivateEvents" boolean NOT NULL DEFAULT false',
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(
+ 'ALTER TABLE "core"."calendarChannel" DROP COLUMN "excludePrivateEvents"',
+ );
+ }
+}
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 4bfa9023011..1ddff90d26f 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
@@ -247,6 +247,7 @@ import { BackfillApplicationRegistrationVersionsSlowInstanceCommand } from 'src/
import { AddUserCreditsFallbackToBillingCustomerFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-49/2-49-instance-command-fast-1792154197828-add-user-credits-fallback-to-billing-customer';
import { AddConnectionProviderScopeFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-49/2-49-instance-command-fast-1792162723868-add-connection-provider-scope';
import { AddConnectedAccountScopeFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-49/2-49-instance-command-fast-1792170228100-add-connected-account-scope';
+import { AddExcludePrivateEventsToCalendarChannelFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-49/2-49-instance-command-fast-1792319637000-add-exclude-private-events-to-calendar-channel';
export const INSTANCE_COMMANDS = [
AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,
@@ -496,4 +497,5 @@ export const INSTANCE_COMMANDS = [
AddUserCreditsFallbackToBillingCustomerFastInstanceCommand,
AddConnectionProviderScopeFastInstanceCommand,
AddConnectedAccountScopeFastInstanceCommand,
+ AddExcludePrivateEventsToCalendarChannelFastInstanceCommand,
];
diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts
index dc15e3c2dad..d6dfc9c9930 100644
--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/calendar-channel-metadata.module.ts
@@ -5,11 +5,13 @@ import { CalendarChannelMetadataService } from 'src/engine/metadata-modules/cale
import { CalendarChannelEntity } from 'src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity';
import { CalendarChannelResolver } from 'src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver';
import { ConnectedAccountMetadataModule } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.module';
+import { CalendarCommonModule } from 'src/modules/calendar/common/calendar-common.module';
@Module({
imports: [
TypeOrmModule.forFeature([CalendarChannelEntity]),
ConnectedAccountMetadataModule,
+ CalendarCommonModule,
],
providers: [CalendarChannelMetadataService, CalendarChannelResolver],
})
diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/calendar-channel.dto.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/calendar-channel.dto.ts
index fee789078fc..15b947778c6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/calendar-channel.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/calendar-channel.dto.ts
@@ -55,6 +55,10 @@ export class CalendarChannelDTO {
@Field(() => CalendarChannelContactAutoCreationPolicy)
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy;
+ @IsBoolean()
+ @Field()
+ excludePrivateEvents: boolean;
+
@IsBoolean()
@Field()
isSyncEnabled: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/update-calendar-channel.input.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/update-calendar-channel.input.ts
index 01517afba69..7792a7b8a06 100644
--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/update-calendar-channel.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/dtos/update-calendar-channel.input.ts
@@ -33,6 +33,11 @@ export class UpdateCalendarChannelInputUpdates {
@Field(() => CalendarChannelContactAutoCreationPolicy, { nullable: true })
contactAutoCreationPolicy?: CalendarChannelContactAutoCreationPolicy;
+ @IsOptional()
+ @IsBoolean()
+ @Field({ nullable: true })
+ excludePrivateEvents?: boolean;
+
@IsOptional()
@IsBoolean()
@Field({ nullable: true })
diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts
index 798f1c784ca..09e16c24eab 100644
--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/entities/calendar-channel.entity.ts
@@ -20,6 +20,7 @@ import {
WebhookSubscriptionStatus,
} from 'twenty-shared/types';
+import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity.type';
@@ -88,6 +89,13 @@ export class CalendarChannelEntity extends WorkspaceRelatedEntity {
})
contactAutoCreationPolicy: CalendarChannelContactAutoCreationPolicy;
+ @Column({ type: 'boolean', nullable: false, default: false })
+ @WasIntroducedInUpgrade({
+ upgradeCommandName:
+ '2.49.0_AddExcludePrivateEventsToCalendarChannelFastInstanceCommand_1792319637000',
+ })
+ excludePrivateEvents: boolean;
+
@Column({ type: 'boolean', nullable: false, default: true })
isSyncEnabled: boolean;
diff --git a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.ts
index eeb29fd4377..9bf2d5a36ff 100644
--- a/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/calendar-channel/resolvers/calendar-channel.resolver.ts
@@ -1,6 +1,9 @@
import { UseGuards, UseInterceptors, UseFilters } from '@nestjs/common';
import { Args, Mutation, Query } from '@nestjs/graphql';
+import { CalendarChannelSyncStage } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
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 { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -14,6 +17,7 @@ import { CalendarChannelDTO } from 'src/engine/metadata-modules/calendar-channel
import { UpdateCalendarChannelInput } from 'src/engine/metadata-modules/calendar-channel/dtos/update-calendar-channel.input';
import { CalendarChannelGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/calendar-channel/interceptors/calendar-channel-graphql-api-exception.interceptor';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
+import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/services/calendar-channel-sync-status.service';
@UseGuards(
AuthPrincipalGuard({
@@ -34,6 +38,7 @@ import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filt
export class CalendarChannelResolver {
constructor(
private readonly calendarChannelMetadataService: CalendarChannelMetadataService,
+ private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService,
) {}
@Query(() => [CalendarChannelDTO])
@@ -71,16 +76,36 @@ export class CalendarChannelResolver {
@AuthWorkspace() workspace: WorkspaceEntity,
@AuthUserWorkspaceId() userWorkspaceId: string,
): Promise<CalendarChannelDTO> {
- await this.calendarChannelMetadataService.verifyOwnership({
- id: input.id,
- userWorkspaceId,
- workspaceId: workspace.id,
- });
+ const calendarChannel =
+ await this.calendarChannelMetadataService.verifyOwnership({
+ id: input.id,
+ userWorkspaceId,
+ workspaceId: workspace.id,
+ });
- return this.calendarChannelMetadataService.update({
- id: input.id,
- workspaceId: workspace.id,
- data: input.update,
- });
+ const updatedCalendarChannel =
+ await this.calendarChannelMetadataService.update({
+ id: input.id,
+ workspaceId: workspace.id,
+ data: input.update,
+ });
+
+ const hasStartedSyncing =
+ calendarChannel.syncStage !==
+ CalendarChannelSyncStage.PENDING_CONFIGURATION;
+
+ const hasExcludePrivateEventsChanged =
+ isDefined(input.update.excludePrivateEvents) &&
+ input.update.excludePrivateEvents !==
+ calendarChannel.excludePrivateEvents;
+
+ if (hasStartedSyncing && hasExcludePrivateEventsChanged) {
+ await this.calendarChannelSyncStatusService.resetAndMarkAsCalendarEventListFetchPending(
+ [calendarChannel.id],
+ workspace.id,
+ );
+ }
+
+ return updatedCalendarChannel;
}
}
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts
index 06c3499177e..594c0beab64 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service.ts
@@ -135,6 +135,7 @@ export class CalendarEventsImportService {
blocklist
.map((blocklistItem) => blocklistItem.handle)
.filter(isDefined),
+ calendarChannel.excludePrivateEvents,
);
const eventExternalIdsToRemove = eventsToRemove.map(
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/__tests__/filter-events-and-return-events-to-remove.util.spec.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/__tests__/filter-events-and-return-events-to-remove.util.spec.ts
index eece313bb3c..f2dc90a0969 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/__tests__/filter-events-and-return-events-to-remove.util.spec.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/__tests__/filter-events-and-return-events-to-remove.util.spec.ts
@@ -2,22 +2,36 @@ import { filterEventsAndReturnEventsToRemove } from 'src/modules/calendar/calend
import { buildFetchedCalendarEvent } from 'src/modules/calendar/calendar-event-import-manager/utils/__tests__/build-fetched-calendar-event.test-util';
describe('filterEventsAndReturnEventsToRemove', () => {
- it('should keep regular events and route cancelled and private events to removal', () => {
- const regularEvent = buildFetchedCalendarEvent({ id: 'regular' });
- const cancelledEvent = buildFetchedCalendarEvent({
- id: 'cancelled',
- isCanceled: true,
- });
- const privateEvent = buildFetchedCalendarEvent({
- id: 'private',
- isPrivate: true,
- });
+ const regularEvent = buildFetchedCalendarEvent({ id: 'regular' });
+ const cancelledEvent = buildFetchedCalendarEvent({
+ id: 'cancelled',
+ isCanceled: true,
+ });
+ const privateEvent = buildFetchedCalendarEvent({
+ id: 'private',
+ isPrivate: true,
+ });
+
+ it('should keep private events and route cancelled events to removal when private events are not excluded', () => {
+ const { filteredEvents, eventsToRemove } =
+ filterEventsAndReturnEventsToRemove(
+ [regularEvent, cancelledEvent, privateEvent],
+ [],
+ false,
+ );
+
+ expect(filteredEvents).toEqual([regularEvent, privateEvent]);
+ expect(eventsToRemove).toEqual([cancelledEvent]);
+ });
+ it('should route cancelled and private events to removal when private events are excluded', () => {
const { filteredEvents, eventsToRemove } =
filterEventsAndReturnEventsToRemove(
[regularEvent, cancelledEvent, privateEvent],
[],
+ true,
);
expect(filteredEvents).toEqual([regularEvent]);
@@ -30,6 +44,7 @@ describe('filterEventsAndReturnEventsToRemove', () => {
[buildFetchedCalendarEvent()],
+ false,
);
expect(filteredEvents).toEqual([]);
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events-and-return-events-to-remove.util.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events-and-return-events-to-remove.util.ts
index 13a0f1ecaae..1b654cad37f 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events-and-return-events-to-remove.util.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/utils/filter-events-and-return-events-to-remove.util.ts
@@ -5,6 +5,7 @@ export const filterEventsAndReturnEventsToRemove = (
calendarChannelHandles: string[],
events: FetchedCalendarEvent[],
blocklist: string[],
+ excludePrivateEvents: boolean,
): {
filteredEvents: FetchedCalendarEvent[];
eventsToRemove: FetchedCalendarEvent[];
@@ -23,7 +24,7 @@ export const filterEventsAndReturnEventsToRemove = (
},
event,
) => {
- if (event.isCanceled || event.isPrivate) {
+ if (event.isCanceled || (excludePrivateEvents && event.isPrivate)) {
acc.eventsToRemove.push(event);
} else {
acc.filteredEvents.push(event);
diff --git a/packages/twenty-server/test/integration/metadata/suites/calendar-channel/calendar-channel-resolver.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/calendar-channel/calendar-channel-resolver.integration-spec.ts
index 74e084dbf65..9791b75d413 100644
--- a/packages/twenty-server/test/integration/metadata/suites/calendar-channel/calendar-channel-resolver.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/calendar-channel/calendar-channel-resolver.integration-spec.ts
@@ -96,5 +96,92 @@ describe('calendarChannelResolver (e2e)', () => {
expect(response.status).toBe(200);
expect(response.body.errors?.[0]?.extensions?.code).toBe('FORBIDDEN');
});
+
+ it('should restart a full sync when private events exclusion changes', async () => {
+ try {
+ await global.testDataSource.query(
+ `UPDATE core."calendarChannel" SET "syncCursor" = 'previous-cursor', "syncStage" = 'CALENDAR_EVENT_LIST_FETCH_PENDING' WHERE id = $1`,
+ [CALENDAR_CHANNEL_DATA_SEED_IDS.JANE],
+ );
+
+ const response = await makeMetadataApiRequest({
+ query: gql`
+ mutation UpdateCalendarChannel(
+ $input: UpdateCalendarChannelInput!
+ ) {
+ updateCalendarChannel(input: $input) {
+ id
+ excludePrivateEvents
+ }
+ }
+ `,
+ variables: {
+ input: {
+ id: CALENDAR_CHANNEL_DATA_SEED_IDS.JANE,
+ update: { excludePrivateEvents: true },
+ },
+ },
+ });
+
+ expect(response.body.errors).toBeUndefined();
+ expect(
+ response.body.data.updateCalendarChannel.excludePrivateEvents,
+ ).toBe(true);
+
+ const [calendarChannel] = await global.testDataSource.query(
+ `SELECT "syncCursor" FROM core."calendarChannel" WHERE id = $1`,
+ [CALENDAR_CHANNEL_DATA_SEED_IDS.JANE],
+ );
+
+ expect(calendarChannel.syncCursor).toBe('');
+ } finally {
+ await global.testDataSource.query(
+ `UPDATE core."calendarChannel" SET "excludePrivateEvents" = false, "syncCursor" = NULL, "syncStage" = 'CALENDAR_EVENT_LIST_FETCH_PENDING' WHERE id = $1`,
+ [CALENDAR_CHANNEL_DATA_SEED_IDS.JANE],
+ );
+ }
+ });
+
+ it('should not restart a sync when private events exclusion changes during configuration', async () => {
+ try {
+ await global.testDataSource.query(
+ `UPDATE core."calendarChannel" SET "syncCursor" = 'previous-cursor', "syncStage" = 'PENDING_CONFIGURATION' WHERE id = $1`,
+ [CALENDAR_CHANNEL_DATA_SEED_IDS.JANE],
+ );
+
+ const response = await makeMetadataApiRequest({
+ query: gql`
+ mutation UpdateCalendarChannel(
+ $input: UpdateCalendarChannelInput!
+ ) {
+ updateCalendarChannel(input: $input) {
+ id
+ }
+ }
+ `,
+ variables: {
+ input: {
+ id: CALENDAR_CHANNEL_DATA_SEED_IDS.JANE,
+ update: { excludePrivateEvents: true },
+ },
+ },
+ });
+
+ expect(response.body.errors).toBeUndefined();
+
+ const [calendarChannel] = await global.testDataSource.query(
+ `SELECT "syncCursor", "syncStage" FROM core."calendarChannel" WHERE id = $1`,
+ [CALENDAR_CHANNEL_DATA_SEED_IDS.JANE],
+ );
+
+ expect(calendarChannel.syncCursor).toBe('previous-cursor');
+ expect(calendarChannel.syncStage).toBe('PENDING_CONFIGURATION');
+ } finally {
+ await global.testDataSource.query(
+ `UPDATE core."calendarChannel" SET "excludePrivateEvents" = false, "syncCursor" = NULL, "syncStage" = 'CALENDAR_EVENT_LIST_FETCH_PENDING' WHERE id = $1`,
+ [CALENDAR_CHANNEL_DATA_SEED_IDS.JANE],
+ );
+ }
+ });
});
});