From caaee4c2aab0e43797b361926c1912933fcaf8d4 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Mon, 3 Mar 2025 18:56:49 +0100
Subject: [PATCH] CB-4067 fixes form ssl saving and driver properties

---
 .../src/ConnectionForm/ConnectionForm.tsx       |  2 --
 .../Options/ConnectionFormOpitonsPart.ts        | 17 +++++++++++++++--
 .../ConnectionForm/SSH/ConnectionFormSSHPart.ts |  1 -
 .../ConnectionForm/SSL/ConnectionFormSSLPart.ts |  3 +--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
index fee5619eea..938c9516ce 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/ConnectionForm.tsx
@@ -57,7 +57,6 @@ export const ConnectionForm = observer<ConnectionFormProps>(function ConnectionF
           if (formState.mode === 'create') {
             notificationService.notify(
               {
-                // TODO add message
                 title: 'connections_connection_create_success',
                 message: info?.name,
               },
@@ -66,7 +65,6 @@ export const ConnectionForm = observer<ConnectionFormProps>(function ConnectionF
           } else {
             notificationService.notify(
               {
-                // TODO add message
                 title: 'connections_connection_update_success',
                 message: info?.name,
               },
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionFormOpitonsPart.ts b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionFormOpitonsPart.ts
index 0b147b5e7a..47647ceac4 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionFormOpitonsPart.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/Options/ConnectionFormOpitonsPart.ts
@@ -181,6 +181,9 @@ export class ConnectionFormOptionsPart extends FormPart<IConnectionFormOptionsSt
     config.autocommit = info.autocommit;
     config.readOnly = info.readOnly;
 
+    // so driver properties tab has initial values
+    config.properties = info.properties;
+
     if (info.authProperties && config.credentials) {
       for (const property of info.authProperties) {
         if (!property.features.includes('password')) {
@@ -395,6 +398,16 @@ export class ConnectionFormOptionsPart extends FormPart<IConnectionFormOptionsSt
     contexts: IExecutionContextProvider<IFormState<IConnectionFormStateRefactored>>,
   ): Promise<void> {
     const status = contexts.getContext(formStatusContext);
+    const state: IConnectionFormOptionsState = {
+      ...this.state,
+      // merges properties from DriverPropertiesPart
+      properties: {
+        ...this.state.properties,
+        ...this.formState.state.config.properties,
+      },
+      // merges network handlers from SSHPart and SSLPart
+      networkHandlersConfig: [...(this.state.networkHandlersConfig ?? []), ...(this.formState.state.config.networkHandlersConfig ?? [])],
+    };
 
     if (!this.formState.state.projectId) {
       status.error('connections_connection_create_fail');
@@ -408,14 +421,14 @@ export class ConnectionFormOptionsPart extends FormPart<IConnectionFormOptionsSt
           this.state,
         );
       } else {
-        const connection = await this.connectionInfoResource.create(this.formState.state.projectId, this.state);
+        const connection = await this.connectionInfoResource.create(this.formState.state.projectId, state);
         this.state.connectionId = connection.id;
         this.formState.state.config.connectionId = connection.id;
         this.formState.setMode(FormMode.Edit);
       }
     } else {
       // TODO message this in ConnectionForm.tsx
-      const info = await this.connectionInfoResource.test(this.formState.state.projectId, this.state);
+      const info = await this.connectionInfoResource.test(this.formState.state.projectId, state);
       status.info('Connection is established');
       status.info('Client version: ' + info.clientVersion);
       status.info('Server version: ' + info.serverVersion);
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
index 2ac4da5bfa..59f9cd6b81 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/ConnectionFormSSHPart.ts
@@ -105,7 +105,6 @@ export class ConnectionFormSSHPart extends FormPart<void, IConnectionFormStateRe
 
       handlerConfig = getTrimmedSSHConfig(handlerConfig);
       config.networkHandlersConfig.push(handlerConfig);
-      this.formState.state.config.networkHandlersConfig = config.networkHandlersConfig;
     }
   }
 
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionFormSSLPart.ts b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionFormSSLPart.ts
index b394ac1207..b7dface7b5 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionFormSSLPart.ts
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSL/ConnectionFormSSLPart.ts
@@ -37,7 +37,7 @@ export class ConnectionFormSSLPart extends FormPart<void, IConnectionFormStateRe
   }
 
   protected override async loader(): Promise<void> {
-    if (!this.isChanged || !this.formState.state.config.driverId) {
+    if (!this.formState.state.config.driverId) {
       return;
     }
 
@@ -157,7 +157,6 @@ export class ConnectionFormSSLPart extends FormPart<void, IConnectionFormStateRe
 
       trimSSLConfig(handlerConfig);
       config.networkHandlersConfig.push(handlerConfig);
-      this.formState.state.config.networkHandlersConfig = config.networkHandlersConfig;
     }
   }