diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json index 22dda39aa9..f9e913a03f 100644 --- a/packages/twenty-server/package.json +++ b/packages/twenty-server/package.json @@ -31,7 +31,8 @@ "@azure/msal-node": "^3.8.4", "@babel/preset-env": "7.26.9", "@blocknote/server-util": "^0.47.1", - "@clickhouse/client": "^1.11.0", + "@clickhouse/client": "^1.18.1", + "@dagrejs/dagre": "^1.1.2", "@e2b/code-interpreter": "^1.0.4", "@envelop/core": "4.0.3", "@envelop/on-resolve": "4.1.0", diff --git a/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.ts b/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.ts index 4298e2095f..2e90c6ba50 100644 --- a/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.ts +++ b/packages/twenty-server/src/database/clickHouse/clickHouse.service.spec.ts @@ -17,6 +17,7 @@ jest.mock('@clickhouse/client', () => ({ close: jest.fn().mockResolvedValue({}), exec: jest.fn().mockResolvedValue({}), }), + ClickHouseLogLevel: { OFF: 'OFF' }, })); describe('ClickHouseService', () => { diff --git a/packages/twenty-server/src/database/clickHouse/clickHouse.service.ts b/packages/twenty-server/src/database/clickHouse/clickHouse.service.ts index bb2f72894a..3ad9cc564f 100644 --- a/packages/twenty-server/src/database/clickHouse/clickHouse.service.ts +++ b/packages/twenty-server/src/database/clickHouse/clickHouse.service.ts @@ -5,7 +5,11 @@ import { type OnModuleInit, } from '@nestjs/common'; -import { type ClickHouseClient, createClient } from '@clickhouse/client'; +import { + type ClickHouseClient, + ClickHouseLogLevel, + createClient, +} from '@clickhouse/client'; import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service'; @@ -29,6 +33,7 @@ export class ClickHouseService implements OnModuleInit, OnModuleDestroy { wait_for_async_insert: 1, }, application: 'twenty', + log: { level: ClickHouseLogLevel.OFF }, }); } } @@ -88,6 +93,7 @@ export class ClickHouseService implements OnModuleInit, OnModuleDestroy { wait_for_async_insert: 1, }, application: 'twenty', + log: { level: ClickHouseLogLevel.OFF }, }); // Ping to check connection diff --git a/packages/twenty-server/src/database/clickHouse/migrations/run-migrations.ts b/packages/twenty-server/src/database/clickHouse/migrations/run-migrations.ts index cfede5bc55..912f0d6cd7 100644 --- a/packages/twenty-server/src/database/clickHouse/migrations/run-migrations.ts +++ b/packages/twenty-server/src/database/clickHouse/migrations/run-migrations.ts @@ -2,7 +2,11 @@ import fs from 'fs'; import path from 'path'; -import { type ClickHouseClient, createClient } from '@clickhouse/client'; +import { + type ClickHouseClient, + ClickHouseLogLevel, + createClient, +} from '@clickhouse/client'; import { config } from 'dotenv'; config({ @@ -24,6 +28,7 @@ async function ensureDatabaseExists() { const [url, database] = clickHouseUrl().split(/\/(?=[^/]*$)/); const client = createClient({ url, + log: { level: ClickHouseLogLevel.OFF }, }); try { @@ -82,6 +87,7 @@ async function runMigrations() { clickhouse_settings: { allow_experimental_json_type: 1, }, + log: { level: ClickHouseLogLevel.OFF }, }); await ensureMigrationTable(client); diff --git a/packages/twenty-server/src/database/clickHouse/seeds/run-seeds.ts b/packages/twenty-server/src/database/clickHouse/seeds/run-seeds.ts index f69e3bf397..fc849144fd 100644 --- a/packages/twenty-server/src/database/clickHouse/seeds/run-seeds.ts +++ b/packages/twenty-server/src/database/clickHouse/seeds/run-seeds.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { createClient } from '@clickhouse/client'; +import { createClient, ClickHouseLogLevel } from '@clickhouse/client'; import { config } from 'dotenv'; import { objectEventFixtures, workspaceEventFixtures } from './fixtures'; @@ -11,6 +11,7 @@ config({ const client = createClient({ url: process.env.CLICKHOUSE_URL, + log: { level: ClickHouseLogLevel.OFF }, }); async function seedEvents() { diff --git a/packages/twenty-server/test/integration/audit/suites/clickHouse-workspace-event-registration.integration-spec.ts b/packages/twenty-server/test/integration/audit/suites/clickHouse-workspace-event-registration.integration-spec.ts index 8450b2286c..1f4faf416e 100644 --- a/packages/twenty-server/test/integration/audit/suites/clickHouse-workspace-event-registration.integration-spec.ts +++ b/packages/twenty-server/test/integration/audit/suites/clickHouse-workspace-event-registration.integration-spec.ts @@ -1,6 +1,10 @@ import process from 'process'; -import { type ClickHouseClient, createClient } from '@clickhouse/client'; +import { + type ClickHouseClient, + ClickHouseLogLevel, + createClient, +} from '@clickhouse/client'; import request from 'supertest'; import { CUSTOM_DOMAIN_ACTIVATED_EVENT } from 'src/engine/core-modules/audit/utils/events/workspace-event/custom-domain/custom-domain-activated'; @@ -14,6 +18,7 @@ describe('ClickHouse Event Registration (integration)', () => { clickHouseClient = createClient({ url: process.env.CLICKHOUSE_URL, + log: { level: ClickHouseLogLevel.OFF }, }); await clickHouseClient.query({ diff --git a/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.ts index 9b6e4f5e5e..4bdad98b21 100644 --- a/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.ts +++ b/packages/twenty-server/test/integration/graphql/suites/event-logs/event-logs.integration-spec.ts @@ -1,6 +1,10 @@ import process from 'process'; -import { type ClickHouseClient, createClient } from '@clickhouse/client'; +import { + type ClickHouseClient, + ClickHouseLogLevel, + createClient, +} from '@clickhouse/client'; import request from 'supertest'; const client = request(`http://localhost:${APP_PORT}`); @@ -18,6 +22,7 @@ describe('Event Logs (integration)', () => { clickhouse_settings: { allow_experimental_json_type: 1, }, + log: { level: ClickHouseLogLevel.OFF }, }); await seedTestData(); diff --git a/yarn.lock b/yarn.lock index 88d3ae713a..1811e2aa42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3724,19 +3724,19 @@ __metadata: languageName: node linkType: hard -"@clickhouse/client-common@npm:1.11.0": - version: 1.11.0 - resolution: "@clickhouse/client-common@npm:1.11.0" - checksum: 10c0/84a74458acdf279bc4e844c235d0f658cb77f82e90f19fa285481c31f2f17210a5e801a61f080d6dfd100d970bc4e15a5692d2b7fd067502fbaad99d0dc51310 +"@clickhouse/client-common@npm:1.18.1": + version: 1.18.1 + resolution: "@clickhouse/client-common@npm:1.18.1" + checksum: 10c0/2545bab6471c06d3e826ffb0fe0f5dc86e39ae08a7d3cb247a624fef83378f74e50028037d3afb40293c9fa55bdda4efe1d4555f4e0c4d83880ac7d19dd87490 languageName: node linkType: hard -"@clickhouse/client@npm:^1.11.0": - version: 1.11.0 - resolution: "@clickhouse/client@npm:1.11.0" +"@clickhouse/client@npm:^1.18.1": + version: 1.18.1 + resolution: "@clickhouse/client@npm:1.18.1" dependencies: - "@clickhouse/client-common": "npm:1.11.0" - checksum: 10c0/8557de33dd9c88d2813d563f89b49e666dc2d8166c9131e9727f6935db8dc65428927b4b4ab20b1bc7646b9c38c1eb8d1e372ba483b0b2bb69d64ed89488dec2 + "@clickhouse/client-common": "npm:1.18.1" + checksum: 10c0/707345c5db3548795f99790ecf06e0cb5ec32b29fbfa0446054d62fe261653023adcdc112aa88ecc0cde38a36b8b68713062312f3dd4b5f2bbfe6fc489204c04 languageName: node linkType: hard @@ -4058,6 +4058,15 @@ __metadata: languageName: node linkType: hard +"@dagrejs/dagre@npm:^1.1.2": + version: 1.1.3 + resolution: "@dagrejs/dagre@npm:1.1.3" + dependencies: + "@dagrejs/graphlib": "npm:2.2.2" + checksum: 10c0/c81e142ed55d23bda02968624bd96987eeb545dbc860b0dc22aafd606f8bd8b1b18914e2b986c46e3250a6cfcc2bc16a944bb8df301da9adffd738936679db44 + languageName: node + linkType: hard + "@dagrejs/dagre@npm:^1.1.8": version: 1.1.8 resolution: "@dagrejs/dagre@npm:1.1.8" @@ -4067,6 +4076,13 @@ __metadata: languageName: node linkType: hard +"@dagrejs/graphlib@npm:2.2.2": + version: 2.2.2 + resolution: "@dagrejs/graphlib@npm:2.2.2" + checksum: 10c0/2e79a4f5c6c402054b7ef42e786459645495934476170999f13867a55a00072636a23914772cce6bc03ce51eef70de589058860b8f034c1d70804fb61e01fcfc + languageName: node + linkType: hard + "@dagrejs/graphlib@npm:2.2.4": version: 2.2.4 resolution: "@dagrejs/graphlib@npm:2.2.4" @@ -57512,7 +57528,8 @@ __metadata: "@azure/msal-node": "npm:^3.8.4" "@babel/preset-env": "npm:7.26.9" "@blocknote/server-util": "npm:^0.47.1" - "@clickhouse/client": "npm:^1.11.0" + "@clickhouse/client": "npm:^1.18.1" + "@dagrejs/dagre": "npm:^1.1.2" "@e2b/code-interpreter": "npm:^1.0.4" "@envelop/core": "npm:4.0.3" "@envelop/on-resolve": "npm:4.1.0"