Merge pull request #3840 from RedisInsight/fe/bugfix/RI-5187

#RI-5187 - fix connection form

Author: mariasergeenko

redisinsight/api/src/modules/database-import/database-import.service.spec.ts

@@ -231,21 +231,23 @@ describe('DatabaseImportService', () => {
         false,
       );
     });
-    it('should create standalone with compressor', async () => {
+    it('should create standalone with compressor and tlsServername', async () => {
       await service['createDatabase'](
         mockSessionMetadata,
         {
           ...mockDatabase,
           compressor: Compressor.GZIP,
+          tlsServername: 'redis-insight',
         },
         0,
       );
 
       expect(databaseRepository.create).toHaveBeenCalledWith(
         mockSessionMetadata,
         {
-          ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'compressor', 'modules']),
+          ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'compressor', 'modules', 'tlsServername']),
           compressor: Compressor.GZIP,
+          tlsServername: 'redis-insight',
           new: true,
         },
         false,

redisinsight/api/src/modules/database-import/dto/import.database.dto.ts

@@ -14,7 +14,7 @@ import { UseClientCertificateDto } from 'src/modules/certificate/dto/use.client-
 export class ImportDatabaseDto extends PickType(Database, [
   'host', 'port', 'name', 'db', 'username', 'password',
   'connectionType', 'tls', 'verifyServerCert', 'sentinelMaster', 'nodes',
-  'new', 'ssh', 'sshOptions', 'provider', 'compressor', 'modules',
+  'new', 'ssh', 'sshOptions', 'provider', 'compressor', 'modules', 'tlsServername',
 ] as const) {
   @Expose()
   @IsNotEmpty()

redisinsight/ui/src/pages/home/components/manual-connection/ManualConnectionWrapper.tsx

@@ -174,6 +174,8 @@ const ManualConnectionWrapper = (props: Props) => {
       sentinelMasterName,
       sentinelMasterUsername,
       sentinelMasterPassword,
+      ssh,
+      tls
     } = values
 
     const database: any = {
@@ -186,6 +188,8 @@ const ManualConnectionWrapper = (props: Props) => {
       password,
       compressor,
       timeout: timeout ? toNumber(timeout) * 1_000 : toNumber(DEFAULT_TIMEOUT),
+      ssh,
+      tls
     }
 
     // add tls & ssh for database (modifies database object)

redisinsight/ui/src/pages/home/utils/form.tsx

@@ -55,6 +55,7 @@ export const applyTlSDatabase = (database: any, tlsSettings: any) => {
   database.tls = useTls
   database.tlsServername = servername
   database.verifyServerCert = !!verifyServerCert
+  database.clientCert = clientCert
 
   if (!isUndefined(caCert?.new)) {
     database.caCert = {
@@ -68,15 +69,15 @@ export const applyTlSDatabase = (database: any, tlsSettings: any) => {
   }
 
   if (clientAuth) {
-    if (!isUndefined(clientCert.new)) {
+    if (!isUndefined(clientCert?.new)) {
       database.clientCert = {
         name: clientCert.new.name,
         certificate: clientCert.new.certificate,
         key: clientCert.new.key,
       }
     }
 
-    if (!isUndefined(clientCert.id)) {
+    if (!isUndefined(clientCert?.id)) {
       database.clientCert = { id: clientCert.id }
     }
   }
@@ -284,8 +285,8 @@ export const getFormValues = (instance?: Nullable<Record<string, any>>) => ({
   modules: instance?.modules,
   showDb: !!instance?.db,
   showCompressor: instance && instance.compressor && instance.compressor !== NONE,
-  sni: !!instance?.servername,
-  servername: instance?.servername,
+  sni: !!instance?.tlsServername,
+  servername: instance?.tlsServername,
   newCaCert: '',
   newCaCertName: '',
   selectedCaCertName: instance?.caCert?.id ?? NO_CA_CERT,

redisinsight/ui/src/utils/comparisons/diff.ts

@@ -29,7 +29,7 @@ export const getFormUpdates = (obj1: UnknownObject = {}, obj2: UnknownObject = {
           result[key] = diff
         }
       } else if (value !== obj2[key] && !(!value && !obj2[key])) {
-        result[key] = value || null
+        result[key] = value ?? null
       }
 
       return result

redisinsight/ui/src/utils/tests/comparisons/diff.spec.ts

@@ -18,7 +18,7 @@ describe('getDiffKeysOfObjectValues', () => {
 
 const getFormUpdatesTests: any[] = [
   [{ name: 'name' }, { name: 'name' }, {}],
-  [{ name: '' }, { name: 'name' }, { name: null }],
+  [{ name: '' }, { name: 'name' }, { name: '' }],
   [{ name: 'name' }, { name: '' }, { name: 'name' }],
   [{ name: 'name', port: 123 }, { name: '', port: 123 }, { name: 'name' }],
   [{ name: 'name', port: 123 }, { name: '', port: 1 }, { name: 'name', port: 123 }],