fix delete modal close + rm extra db props on save

apache · Sep 10, 2020 · 42e90a3 · 42e90a3
1 parent 358cfdd
commit 42e90a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
@@ -100,6 +100,9 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
       () => {
         refreshData();
         addSuccessToast(t('Deleted: %s', dbName));
+
+        // Close delete modal
+        setDatabaseCurrentlyDeleting(null);
       },
       createErrorHandler(errMsg =>
         addDangerToast(t('There was an issue deleting %s: %s', dbName, errMsg)),

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx
@@ -189,22 +189,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         delete update.id;
       }
 
-      if (!update.cache_timeout) {
-        update.cache_timeout = '0';
-      }
-
-      if (!update.encrypted_extra) {
-        update.encrypted_extra = '';
-      }
-
-      if (!update.force_ctas_schema) {
-        update.force_ctas_schema = '';
-      }
-
-      if (!update.server_cert) {
-        update.server_cert = '';
-      }
-
       if (db && db.id) {
         updateResource(db.id, update).then(() => {
           if (onDatabaseAdd) {