From 904c5065916c3a47fa8f494996b16cf6dacd8531 Mon Sep 17 00:00:00 2001
From: AAfghahi <48933336+AAfghahi@users.noreply.github.com>
Date: Wed, 29 Sep 2021 13:02:34 -0400
Subject: [PATCH] fixing db connection (#16899)

---
 superset-frontend/src/views/CRUD/hooks.ts | 2 +-
 superset/databases/api.py                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index a67317e04c..54eccad0f9 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -330,7 +330,7 @@ export function useSingleViewResource<D extends object = any>(
         .then(
           ({ json = {} }) => {
             updateState({
-              resource: json.result,
+              resource: { ...json.result, id: json.id },
               error: null,
             });
             return json.result;
diff --git a/superset/databases/api.py b/superset/databases/api.py
index b93f489729..f095aaf8d1 100644
--- a/superset/databases/api.py
+++ b/superset/databases/api.py
@@ -331,6 +331,8 @@ class DatabaseRestApi(BaseSupersetModelRestApi):
             changed_model = UpdateDatabaseCommand(g.user, pk, item).run()
             # Return censored version for sqlalchemy URI
             item["sqlalchemy_uri"] = changed_model.sqlalchemy_uri
+            if changed_model.parameters:
+                item["parameters"] = changed_model.parameters
             return self.response(200, id=changed_model.id, result=item)
         except DatabaseNotFoundError:
             return self.response_404()