twentyhq · AMoreaux · Apr 18, 2025 · Apr 18, 2025 · Apr 18, 2025 · Apr 18, 2025
diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
@@ -184,7 +184,7 @@ jobs:
     env:
       NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
       NODE_ENV: test
-      ANALYTICS_ENABLED: true
+      IS_ANALYTICS_ENABLED: true
       CLICKHOUSE_URL: "http://default:clickhousePassword@localhost:8123/twenty"
       CLICKHOUSE_PASSWORD: clickhousePassword
     steps:

diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -298,7 +298,6 @@ export enum CaptchaDriverType {
 
 export type ClientConfig = {
   __typename?: 'ClientConfig';
-  analyticsEnabled: Scalars['Boolean']['output'];
   api: ApiConfig;
   authProviders: AuthProviders;
   billing: Billing;
@@ -308,6 +307,7 @@ export type ClientConfig = {
   debugMode: Scalars['Boolean']['output'];
   defaultSubdomain?: Maybe<Scalars['String']['output']>;
   frontDomain: Scalars['String']['output'];
+  isAnalyticsEnabled: Scalars['Boolean']['output'];
   isAttachmentPreviewEnabled: Scalars['Boolean']['output'];
   isEmailVerificationRequired: Scalars['Boolean']['output'];
   isGoogleCalendarEnabled: Scalars['Boolean']['output'];
@@ -517,6 +517,15 @@ export type CustomDomainValidRecords = {
   records: Array<CustomDomainRecord>;
 };
 
+/** Database Event Action */
+export enum DatabaseEventAction {
+  CREATED = 'CREATED',
+  DELETED = 'DELETED',
+  DESTROYED = 'DESTROYED',
+  RESTORED = 'RESTORED',
+  UPDATED = 'UPDATED'
+}
+
 export type DateFilter = {
   eq?: InputMaybe<Scalars['Date']['input']>;
   gt?: InputMaybe<Scalars['Date']['input']>;
@@ -1500,6 +1509,21 @@ export type ObjectStandardOverrides = {
   translations?: Maybe<Scalars['JSON']['output']>;
 };
 
+export type OnDbEventDto = {
+  __typename?: 'OnDbEventDTO';
+  action: DatabaseEventAction;
+  eventDate: Scalars['DateTime']['output'];
+  objectNameSingular: Scalars['String']['output'];
+  record: Scalars['JSON']['output'];
+  updatedFields?: Maybe<Array<Scalars['String']['output']>>;
+};
+
+export type OnDbEventInput = {
+  action?: InputMaybe<DatabaseEventAction>;
+  objectNameSingular?: InputMaybe<Scalars['String']['input']>;
+  recordId?: InputMaybe<Scalars['String']['input']>;
+};
+
 /** Onboarding status */
 export enum OnboardingStatus {
   COMPLETED = 'COMPLETED',
@@ -2090,6 +2114,16 @@ export type SubmitFormStepInput = {
   workflowRunId: Scalars['String']['input'];
 };
 
+export type Subscription = {
+  __typename?: 'Subscription';
+  onDbEvent: OnDbEventDto;
+};
+
+
+export type SubscriptionOnDbEventArgs = {
+  input: OnDbEventInput;
+};
+
 export enum SubscriptionInterval {
   Day = 'Day',
   Month = 'Month',

diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
@@ -290,7 +290,6 @@ export enum CaptchaDriverType {
 
 export type ClientConfig = {
   __typename?: 'ClientConfig';
-  analyticsEnabled: Scalars['Boolean'];
   api: ApiConfig;
   authProviders: AuthProviders;
   billing: Billing;
@@ -300,6 +299,7 @@ export type ClientConfig = {
   debugMode: Scalars['Boolean'];
   defaultSubdomain?: Maybe<Scalars['String']>;
   frontDomain: Scalars['String'];
+  isAnalyticsEnabled: Scalars['Boolean'];
   isAttachmentPreviewEnabled: Scalars['Boolean'];
   isEmailVerificationRequired: Scalars['Boolean'];
   isGoogleCalendarEnabled: Scalars['Boolean'];
@@ -2660,7 +2660,7 @@ export type SwitchSubscriptionToYearlyIntervalMutation = { __typename?: 'Mutatio
 export type GetClientConfigQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetClientConfigQuery = { __typename?: 'Query', clientConfig: { __typename?: 'ClientConfig', signInPrefilled: boolean, isMultiWorkspaceEnabled: boolean, isEmailVerificationRequired: boolean, defaultSubdomain?: string | null, frontDomain: string, debugMode: boolean, analyticsEnabled: boolean, isAttachmentPreviewEnabled: boolean, chromeExtensionId?: string | null, canManageFeatureFlags: boolean, isMicrosoftMessagingEnabled: boolean, isMicrosoftCalendarEnabled: boolean, isGoogleMessagingEnabled: boolean, isGoogleCalendarEnabled: boolean, billing: { __typename?: 'Billing', isBillingEnabled: boolean, billingUrl?: string | null, trialPeriods: Array<{ __typename?: 'BillingTrialPeriodDTO', duration: number, isCreditCardRequired: boolean }> }, authProviders: { __typename?: 'AuthProviders', google: boolean, password: boolean, microsoft: boolean, sso: Array<{ __typename?: 'SSOIdentityProvider', id: string, name: string, type: IdentityProviderType, status: SsoIdentityProviderStatus, issuer: string }> }, support: { __typename?: 'Support', supportDriver: string, supportFrontChatId?: string | null }, sentry: { __typename?: 'Sentry', dsn?: string | null, environment?: string | null, release?: string | null }, captcha: { __typename?: 'Captcha', provider?: CaptchaDriverType | null, siteKey?: string | null }, api: { __typename?: 'ApiConfig', mutationMaximumAffectedRecords: number }, publicFeatureFlags: Array<{ __typename?: 'PublicFeatureFlag', key: FeatureFlagKey, metadata: { __typename?: 'PublicFeatureFlagMetadata', label: string, description: string, imagePath: string } }> } };
+export type GetClientConfigQuery = { __typename?: 'Query', clientConfig: { __typename?: 'ClientConfig', signInPrefilled: boolean, isMultiWorkspaceEnabled: boolean, isEmailVerificationRequired: boolean, defaultSubdomain?: string | null, frontDomain: string, debugMode: boolean, isAnalyticsEnabled: boolean, isAttachmentPreviewEnabled: boolean, chromeExtensionId?: string | null, canManageFeatureFlags: boolean, isMicrosoftMessagingEnabled: boolean, isMicrosoftCalendarEnabled: boolean, isGoogleMessagingEnabled: boolean, isGoogleCalendarEnabled: boolean, billing: { __typename?: 'Billing', isBillingEnabled: boolean, billingUrl?: string | null, trialPeriods: Array<{ __typename?: 'BillingTrialPeriodDTO', duration: number, isCreditCardRequired: boolean }> }, authProviders: { __typename?: 'AuthProviders', google: boolean, password: boolean, microsoft: boolean, sso: Array<{ __typename?: 'SSOIdentityProvider', id: string, name: string, type: IdentityProviderType, status: SsoIdentityProviderStatus, issuer: string }> }, support: { __typename?: 'Support', supportDriver: string, supportFrontChatId?: string | null }, sentry: { __typename?: 'Sentry', dsn?: string | null, environment?: string | null, release?: string | null }, captcha: { __typename?: 'Captcha', provider?: CaptchaDriverType | null, siteKey?: string | null }, api: { __typename?: 'ApiConfig', mutationMaximumAffectedRecords: number }, publicFeatureFlags: Array<{ __typename?: 'PublicFeatureFlag', key: FeatureFlagKey, metadata: { __typename?: 'PublicFeatureFlagMetadata', label: string, description: string, imagePath: string } }> } };
 
 export type SearchQueryVariables = Exact<{
   searchInput: Scalars['String'];
@@ -4466,7 +4466,7 @@ export const GetClientConfigDocument = gql`
     defaultSubdomain
     frontDomain
     debugMode
-    analyticsEnabled
+    isAnalyticsEnabled
     isAttachmentPreviewEnabled
     support {
       supportDriver

diff --git a/packages/twenty-front/src/modules/action-menu/actions/display/components/ActionButton.tsx b/packages/twenty-front/src/modules/action-menu/actions/display/components/ActionButton.tsx
@@ -50,7 +50,6 @@ export const ActionButton = ({
           />
           <StyledWrapper>
             <AppTooltip
-              // eslint-disable-next-line
               anchorSelect={`#action-menu-entry-${action.key}`}
               content={label}
               delay={TooltipDelay.longDelay}

diff --git a/packages/twenty-front/src/modules/captcha/hooks/useRequestFreshCaptchaToken.ts b/packages/twenty-front/src/modules/captcha/hooks/useRequestFreshCaptchaToken.ts
@@ -52,8 +52,6 @@ export const useRequestFreshCaptchaToken = () => {
               });
             break;
           case CaptchaDriverType.Turnstile:
-            // TODO: fix workspace-no-hardcoded-colors rule
-            // eslint-disable-next-line @nx/workspace-no-hardcoded-colors
             captchaWidget = window.turnstile.render('#captcha-widget', {
               sitekey: captcha.siteKey,
             });

diff --git a/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx b/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
@@ -120,7 +120,7 @@ export const ClientConfigProviderEffect = () => {
       sso: data?.clientConfig.authProviders.sso,
     });
     setIsDebugMode(data?.clientConfig.debugMode);
-    setIsAnalyticsEnabled(data?.clientConfig.analyticsEnabled);
+    setIsAnalyticsEnabled(data?.clientConfig.isAnalyticsEnabled);
     setIsDeveloperDefaultSignInPrefilled(data?.clientConfig.signInPrefilled);
     setIsMultiWorkspaceEnabled(data?.clientConfig.isMultiWorkspaceEnabled);
     setIsEmailVerificationRequired(

diff --git a/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts b/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts
@@ -29,7 +29,7 @@ export const GET_CLIENT_CONFIG = gql`
       defaultSubdomain
       frontDomain
       debugMode
-      analyticsEnabled
+      isAnalyticsEnabled
       isAttachmentPreviewEnabled
       support {
         supportDriver

diff --git a/...les/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx b/...les/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx
@@ -153,7 +153,6 @@ export const ObjectOptionsDropdownMenuContent = () => {
         </div>
         {currentView?.key === 'INDEX' && (
           <AppTooltip
-            // eslint-disable-next-line
             anchorSelect={`#delete-view-menu-item`}
             content={t`Not available on Default View`}
             noArrow

diff --git a/packages/twenty-front/src/testing/mock-data/config.ts b/packages/twenty-front/src/testing/mock-data/config.ts
@@ -16,7 +16,7 @@ export const mockedClientConfig: ClientConfig = {
   defaultSubdomain: 'app',
   chromeExtensionId: 'MOCKED_EXTENSION_ID',
   debugMode: false,
-  analyticsEnabled: true,
+  isAnalyticsEnabled: true,
   support: {
     supportDriver: 'front',
     supportFrontChatId: null,

diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.example
@@ -76,5 +76,5 @@ FRONTEND_URL=http://localhost:3001
 # CLOUDFLARE_ZONE_ID=
 # CLOUDFLARE_WEBHOOK_SECRET=
 # IS_CONFIG_VARIABLES_IN_DB_ENABLED=false
-# ANALYTICS_ENABLED=
+# IS_ANALYTICS_ENABLED=
 # CLICKHOUSE_URL=http://default:clickhousePassword@localhost:8123/twenty
diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json
@@ -12,6 +12,7 @@
     "worker:prod": "node dist/src/queue-worker/queue-worker",
     "database:init:prod": "npx ts-node ./scripts/setup-db.ts && yarn database:migrate:prod",
     "database:migrate:prod": "npx -y typeorm migration:run -d dist/src/database/typeorm/metadata/metadata.datasource && npx -y typeorm migration:run -d dist/src/database/typeorm/core/core.datasource",
+    "clickhouse:migrate:prod": "npx ts-node ./src/database/clickhouse/migrations/run-migrations.ts",
     "typeorm": "../../node_modules/typeorm/.bin/typeorm"
   },
   "dependencies": {

diff --git a/packages/twenty-server/src/database/clickhouse/migrations/001-create-events-table.sql b/packages/twenty-server/src/database/clickhouse/migrations/001-create-events-table.sql
@@ -6,5 +6,7 @@ CREATE TABLE IF NOT EXISTS events
     `workspaceId` String DEFAULT '',
     `properties`  JSON
 )
-    ENGINE = MergeTree
-        ORDER BY (event, workspaceId, timestamp);
+ENGINE = MergeTree
+ORDER BY (event, workspaceId, timestamp)
+SETTINGS index_granularity = 8192
+SETTINGS allow_experimental_json_type = 1;
diff --git a/packages/twenty-server/src/database/clickhouse/migrations/002-create-pageview-table.sql b/packages/twenty-server/src/database/clickhouse/migrations/002-create-pageview-table.sql
@@ -6,5 +6,7 @@ CREATE TABLE IF NOT EXISTS pageview
     `userId`      String DEFAULT '',
     `workspaceId` String DEFAULT ''
 )
-    ENGINE = MergeTree
-        ORDER BY (name, workspaceId, userId, timestamp);
+ENGINE = MergeTree
+ORDER BY (name, workspaceId, userId, timestamp)
+SETTINGS index_granularity = 8192
+SETTINGS allow_experimental_json_type = 1;
diff --git a/packages/twenty-server/src/database/clickhouse/migrations/run-migrations.ts b/packages/twenty-server/src/database/clickhouse/migrations/run-migrations.ts
@@ -29,9 +29,6 @@ async function ensureDatabaseExists() {
   await client.command({
     query: `CREATE DATABASE IF NOT EXISTS "${database}"`,
   });
-  await client.command({
-    query: `SET enable_json_type = 1`,
-  });
 
   await client.close();
 }

diff --git a/packages/twenty-server/src/engine/core-modules/analytics/services/analytics.service.ts b/packages/twenty-server/src/engine/core-modules/analytics/services/analytics.service.ts
@@ -58,7 +58,7 @@ export class AnalyticsService {
   private preventAnalyticsIfDisabled(
     sendEventOrPageviewFunction: () => Promise<{ success: boolean }>,
   ) {
-    if (!this.twentyConfigService.get('ANALYTICS_ENABLED')) {
+    if (!this.twentyConfigService.get('IS_ANALYTICS_ENABLED')) {
       return { success: true };
     }
     try {

diff --git a/packages/twenty-server/src/engine/core-modules/analytics/services/clickhouse.service.spec.ts b/packages/twenty-server/src/engine/core-modules/analytics/services/clickhouse.service.spec.ts
@@ -49,7 +49,7 @@ describe('ClickhouseService', () => {
           provide: TwentyConfigService,
           useValue: {
             get: jest.fn((key) => {
-              if (key === 'ANALYTICS_ENABLED') return true;
+              if (key === 'IS_ANALYTICS_ENABLED') return true;
               if (key === 'CLICKHOUSE_URL') return 'http://localhost:8123';
 
               return null;
@@ -83,7 +83,7 @@ describe('ClickhouseService', () => {
   describe('constructor', () => {
     it('should not initialize clickhouse client when analytics is disabled', async () => {
       jest.spyOn(twentyConfigService, 'get').mockImplementation((key) => {
-        if (key === 'ANALYTICS_ENABLED') return false;
+        if (key === 'IS_ANALYTICS_ENABLED') return false;
       });
 
       const newModule: TestingModule = await Test.createTestingModule({

diff --git a/packages/twenty-server/src/engine/core-modules/analytics/services/clickhouse.service.ts b/packages/twenty-server/src/engine/core-modules/analytics/services/clickhouse.service.ts
@@ -16,7 +16,7 @@ export class ClickhouseService {
     private readonly exceptionHandlerService: ExceptionHandlerService,
     private readonly twentyConfigService: TwentyConfigService,
   ) {
-    if (twentyConfigService.get('ANALYTICS_ENABLED')) {
+    if (twentyConfigService.get('IS_ANALYTICS_ENABLED')) {
       this.clickhouseClient = createClient({
         url: twentyConfigService.get('CLICKHOUSE_URL'),
         compression: {

diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
@@ -105,7 +105,7 @@ export class ClientConfig {
   debugMode: boolean;
 
   @Field(() => Boolean)
-  analyticsEnabled: boolean;
+  isAnalyticsEnabled: boolean;
 
   @Field(() => Support)
   support: Support;

diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
@@ -79,7 +79,7 @@ export class ClientConfigResolver {
       isAttachmentPreviewEnabled: this.twentyConfigService.get(
         'IS_ATTACHMENT_PREVIEW_ENABLED',
       ),
-      analyticsEnabled: this.twentyConfigService.get('ANALYTICS_ENABLED'),
+      isAnalyticsEnabled: this.twentyConfigService.get('IS_ANALYTICS_ENABLED'),
       canManageFeatureFlags:
         this.twentyConfigService.get('NODE_ENV') ===
           NodeEnvironment.development ||

diff --git a/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts b/packages/twenty-server/src/engine/core-modules/twenty-config/config-variables.ts
@@ -461,7 +461,7 @@ export class ConfigVariables {
   @CastToBoolean()
   @IsOptional()
   @IsBoolean()
-  ANALYTICS_ENABLED = false;
+  IS_ANALYTICS_ENABLED = false;
 
   @ConfigVariablesMetadata({
     group: ConfigVariablesGroup.AnalyticsConfig,
@@ -472,7 +472,7 @@ export class ConfigVariables {
     require_tld: false,
     allow_underscores: true,
   })
-  @ValidateIf((env) => env.ANALYTICS_ENABLED === true)
+  @ValidateIf((env) => env.IS_ANALYTICS_ENABLED === true)
   CLICKHOUSE_URL: string;
 
   @ConfigVariablesMetadata({