merged pexdax and then pushed

apache · Jun 10, 2021 · 9fb68e0 · 9fb68e0
1 parent 4632093
commit 9fb68e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -282,7 +282,7 @@ const queryField = ({
     id="query"
     name="query"
     required={required}
-    value={db?.query}
+    value={db?.parameters?.query}
     validationMethods={{ onBlur: getValidation }}
     errorMessage={validationErrors?.query}
     placeholder="e.g. additional parameters"

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -282,10 +282,10 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           credentials_info: JSON.parse(update.encrypted_extra),
         });
       }
-      if (update.parameters.query) {
+      if (update?.parameters?.query) {
         // convert query params into dictionary
         update.parameters.query = JSON.parse(
-          `{"${decodeURI(db.parameters.query || '')
+          `{"${decodeURI(db.parameters?.query || '')
             .replace(/"/g, '\\"')
             .replace(/&/g, '","')
             .replace(/=/g, '":"')}"}`,