#RI-5447 fix timeout overwritten during connection [skip ci]

Author: Artem

redisinsight/api/src/modules/database/database-connection.service.ts

@@ -35,7 +35,6 @@ export class DatabaseConnectionService {
     const toUpdate: Partial<Database> = {
       new: false,
       lastConnection: new Date(),
-      timeout: client.options.connectTimeout,
       modules: await this.databaseInfoProvider.determineDatabaseModules(client),
       version: await this.databaseInfoProvider.determineDatabaseServer(client),
     };

redisinsight/api/src/modules/database/models/database.ts

@@ -21,7 +21,6 @@ import { SentinelMaster } from 'src/modules/redis-sentinel/models/sentinel-maste
 import { Endpoint } from 'src/common/models';
 import { AdditionalRedisModule } from 'src/modules/database/models/additional.redis.module';
 import { SshOptions } from 'src/modules/ssh/models/ssh-options';
-import { Default } from 'src/common/decorators';
 import { CloudDatabaseDetails } from 'src/modules/cloud/database/models/cloud-database-details';
 
 const CONNECTIONS_CONFIG = config.get('connections');
@@ -110,7 +109,6 @@ export class Database {
   @Min(1_000)
   @Max(1_000_000_000)
   @IsInt({ always: true })
-  @Default(CONNECTIONS_CONFIG.timeout)
   timeout?: number = CONNECTIONS_CONFIG.timeout;
 
   @ApiProperty({

redisinsight/api/src/modules/database/repositories/local.database.repository.ts

@@ -128,9 +128,13 @@ export class LocalDatabaseRepository extends DatabaseRepository {
    */
   public async update(id: string, database: Partial<Database>): Promise<Database> {
     const oldEntity = await this.decryptEntity((await this.repository.findOneBy({ id })), true);
+    console.log('___ oldEntity', oldEntity)
     const newEntity = classToClass(DatabaseEntity, await this.populateCertificates(database as Database));
 
+    console.log('___ newEntity', newEntity)
+
     const mergeResult = this.repository.merge(oldEntity, newEntity);
+    console.log('___ mergeResult', mergeResult)
 
     if (newEntity.caCert === null) {
       mergeResult.caCert = null;
@@ -146,6 +150,7 @@ export class LocalDatabaseRepository extends DatabaseRepository {
 
     const encrypted = await this.encryptEntity(mergeResult);
 
+    console.log('___ encrypted', encrypted)
     await this.repository.save(encrypted);
 
     // workaround for one way cascade deletion

yarn.lock

@@ -10642,11 +10642,6 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.
   dependencies:
     yallist "^4.0.0"
 
-minipass@^4.0.0:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a"
-  integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
-
 minipass@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"