Hotfix: TJDB connection on feature disabled flag (#9579)

* fix TJDB deps for feature flag

* support async loading of db connection

* conditionally init TJDB connection on boot

* bump to v2.39.1

.version

@@ -1 +1 @@
-2.39.0
+2.39.1

frontend/.version

@@ -1 +1 @@
-2.39.0
+2.39.1

server/.version

@@ -1 +1 @@
-2.39.0
+2.39.1

server/src/app.module.ts

@@ -138,6 +138,7 @@ const imports = [
  ImportExportResourcesModule,
  CopilotModule,
  OrganizationConstantModule,
+ TooljetDbModule,
 ];
 
 if (process.env.SERVE_CLIENT !== 'false' && process.env.NODE_ENV === 'production') {
@@ -165,7 +166,6 @@ if (process.env.COMMENT_FEATURE_ENABLE !== 'false') {
 }
 
 if (process.env.ENABLE_TOOLJET_DB === 'true') {
- imports.unshift(TooljetDbModule);
  imports.unshift(TypeOrmModule.forRoot(tooljetDbOrmconfig));
 }
 

server/src/modules/import_export_resources/import_export_resources.module.ts

@@ -11,7 +11,6 @@ import { Plugin } from 'src/entities/plugin.entity';
 import { PluginsHelper } from 'src/helpers/plugins.helper';
 import { CredentialsService } from '@services/credentials.service';
 import { DataSource } from 'src/entities/data_source.entity';
-import { tooljetDbOrmconfig } from '../../../ormconfig';
 import { PluginsModule } from '../plugins/plugins.module';
 import { EncryptionService } from '@services/encryption.service';
 import { Credential } from '../../../src/entities/credential.entity';
@@ -29,10 +28,6 @@ const imports = [
  TooljetDbModule,
 ];
 
-if (process.env.ENABLE_TOOLJET_DB === 'true') {
- imports.unshift(TypeOrmModule.forRoot(tooljetDbOrmconfig));
-}
-
 @Module({
  imports,
  controllers: [ImportExportResourcesController],

server/src/modules/tooljet_db/tooljet_db.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, OnModuleInit } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Credential } from '../../../src/entities/credential.entity';
 import { TooljetDbController } from '@controllers/tooljet_db.controller';
@@ -7,12 +7,19 @@ import { TooljetDbService } from '@services/tooljet_db.service';
 import { PostgrestProxyService } from '@services/postgrest_proxy.service';
 import { TooljetDbBulkUploadService } from '@services/tooljet_db_bulk_upload.service';
 import { TooljetDbOperationsService } from '@services/tooljet_db_operations.service';
-import { tooljetDbOrmconfig } from 'ormconfig';
+import { ConfigService } from '@nestjs/config';
 
 @Module({
- imports: [TypeOrmModule.forFeature([Credential]), TypeOrmModule.forRoot(tooljetDbOrmconfig), CaslModule],
+ imports: [TypeOrmModule.forFeature([Credential]), CaslModule],
  controllers: [TooljetDbController],
  providers: [TooljetDbService, TooljetDbBulkUploadService, TooljetDbOperationsService, PostgrestProxyService],
  exports: [TooljetDbOperationsService],
 })
-export class TooljetDbModule {}
+export class TooljetDbModule implements OnModuleInit {
+ constructor(private configService: ConfigService) {}
+
+ onModuleInit() {
+ const enableTooljetDb = this.configService.get('ENABLE_TOOLJET_DB') === 'true';
+ console.log(`ToolJet Database enabled: ${enableTooljetDb}`);
+ }
+}

server/src/services/tooljet_db.service.ts

@@ -49,6 +49,8 @@ SelectQueryBuilder.prototype.fullOuterJoin = function (entityOrProperty, alias,
 export class TooljetDbService {
  constructor(
  private readonly manager: EntityManager,
+ // TODO: remove optional decorator when
+ // ENABLE_TOOLJET_DB flag is deprecated
  @Optional()
  @InjectEntityManager('tooljetDb')
  private readonly tooljetDbManager: EntityManager

server/src/services/tooljet_db_bulk_upload.service.ts

@@ -1,4 +1,4 @@
-import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, Injectable, NotFoundException, Optional } from '@nestjs/common';
 import { EntityManager } from 'typeorm';
 import { InternalTable } from 'src/entities/internal_table.entity';
 import * as csv from 'fast-csv';
@@ -14,6 +14,9 @@ const MAX_ROW_COUNT = 1000;
 export class TooljetDbBulkUploadService {
  constructor(
  private readonly manager: EntityManager,
+ // TODO: remove optional decorator when
+ // ENABLE_TOOLJET_DB flag is deprecated
+ @Optional()
  @InjectEntityManager('tooljetDb')
  private readonly tooljetDbManager: EntityManager,
  private readonly tooljetDbService: TooljetDbService