fix type script issues

apache · Jun 14, 2021 · 7c918e8 · 7c918e8
1 parent 4fac58f
commit 7c918e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -130,6 +130,7 @@ function dbReducer(
   const trimmedState = {
     ...(state || {}),
   };
+  let query = '';
 
   switch (action.type) {
     case ActionType.inputChange:
@@ -169,10 +170,11 @@ function dbReducer(
         [action.payload.name]: action.payload.value,
       };
     case ActionType.fetched:
-      let query = '';
       if (action.payload?.parameters?.query) {
         // convert query into URI params string
-        query = new URLSearchParams(action.payload.parameters.query).toString();
+        query = new URLSearchParams(
+          action.payload.parameters.query as string,
+        ).toString();
       }
       return {
         engine: trimmedState.engine,
@@ -278,12 +280,12 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     if (update?.parameters?.query) {
       // convert query params into dictionary
       update.parameters.query = JSON.parse(
-        `{"${decodeURI(update?.parameters?.query || '')
+        `{"${decodeURI((update?.parameters?.query as string) || '')
           .replace(/"/g, '\\"')
           .replace(/&/g, '","')
           .replace(/=/g, '":"')}"}`,
       );
-    } else {
+    } else if (update.parameters) {
       update.parameters.query = {};
     }
 
@@ -309,7 +311,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
       if (update?.parameters?.query) {
         // convert query params into dictionary
         update.parameters.query = JSON.parse(
-          `{"${decodeURI(db.parameters?.query || '')
+          `{"${decodeURI((db.parameters?.query as string) || '')
             .replace(/"/g, '\\"')
             .replace(/&/g, '","')
             .replace(/=/g, '":"')}"}`,

diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -38,7 +38,7 @@ export type DatabaseObject = {
     username?: string;
     password?: string;
     encryption?: boolean;
-    query?: string;
+    query?: string | object;
   };
   configuration_method: CONFIGURATION_METHOD;
   engine?: string;