From 02fb3769e926825c91cc5b709972c5349a0805ba Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Tue, 30 Mar 2021 14:55:14 +0300
Subject: [PATCH] fix(core-connections): CB-886 send provider properties
 default values if they exist

---
 .../src/FormControls/ComboboxNew.tsx            |  1 +
 .../Options/ConnectionOptionsTabService.ts      | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx b/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx
index 5c5c9056cc..befc34b5ae 100644
--- a/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/ComboboxNew.tsx
@@ -241,6 +241,7 @@ export const ComboboxNew: ComboboxType = observer(function ComboboxNew({
           name={name}
           title={title}
           value={inputValue}
+          disabled={disabled}
           readOnly={readOnly}
           onChange={handleChange}
           {...rest}
diff --git a/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts b/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
index d49249cd0c..c742c38059 100644
--- a/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
+++ b/webapp/packages/core-connections/src/ConnectionForm/Options/ConnectionOptionsTabService.ts
@@ -186,8 +186,21 @@ export class ConnectionOptionsTabService extends Bootstrap {
       }
     }
 
-    if (Object.keys(data.config.providerProperties).length > 0) {
-      config.providerProperties = data.config.providerProperties;
+    if (driver.providerProperties.length > 0) {
+      const providerProperties: Record<string, any> = { ...data.config.providerProperties };
+
+      for (const providerProperty of driver.providerProperties) {
+        if (providerProperty.defaultValue === null
+          || providerProperty.defaultValue === undefined
+          || !providerProperty.id
+          || providerProperty.id in providerProperties) {
+          continue;
+        }
+
+        providerProperties[providerProperty.id] = providerProperty.defaultValue;
+      }
+
+      config.providerProperties = providerProperties;
     }
   }