From 2252f3396c64a5f1cb744449a1222a9306d4d249 Mon Sep 17 00:00:00 2001
From: "Hugh A. Miles II" <hughmil3s@gmail.com>
Date: Mon, 12 Jul 2021 15:37:44 -0700
Subject: [PATCH] fix: Remove default values for engine and schemas (#15635)

* remove default values

* don't set initial value on save

* set defaults for engine_params

* update with JSON.parse
---
 .../views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx  | 4 ++--
 .../src/views/CRUD/data/database/DatabaseModal/index.tsx     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
index a2a49b2f70..32bc7bdadb 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/ExtraOptions.tsx
@@ -414,7 +414,7 @@ const ExtraOptions = ({
           <div className="input-container">
             <StyledJsonEditor
               name="metadata_params"
-              value={db?.extra_json?.metadata_params || '{}'}
+              value={db?.extra_json?.metadata_params || ''}
               placeholder={t('Metadata Parameters')}
               onChange={(json: string) =>
                 onExtraEditorChange({ json, name: 'metadata_params' })
@@ -436,7 +436,7 @@ const ExtraOptions = ({
           <div className="input-container">
             <StyledJsonEditor
               name="engine_params"
-              value={db?.extra_json?.engine_params || '{}'}
+              value={db?.extra_json?.engine_params || ''}
               placeholder={t('Engine Parameters')}
               onChange={(json: string) =>
                 onExtraEditorChange({ json, name: 'engine_params' })
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index e755cc5df9..54a8cc4f55 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -468,9 +468,10 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         engine_params: JSON.parse(
           (dbToUpdate?.extra_json?.engine_params as string) || '{}',
         ),
-        schemas_allowed_for_csv_upload:
+        schemas_allowed_for_csv_upload: JSON.parse(
           (dbToUpdate?.extra_json?.schemas_allowed_for_csv_upload as string) ||
-          '[]',
+            '[]',
+        ),
       });
     }