From 761f69690409f8ffdd92511af6264d9c34519bbf Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 15 Jun 2021 22:01:52 -0400
Subject: [PATCH 1/7] working big query edits

---
 .../DatabaseModal/DatabaseConnectionForm.tsx  | 44 +++++++++++--------
 .../data/database/DatabaseModal/index.tsx     |  9 +++-
 2 files changed, 34 insertions(+), 19 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
index 0906a6cf71914..27bff7cfea5a1 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -65,32 +65,40 @@ interface FieldPropTypes {
   sslForced?: boolean;
 }
 
-const CredentialsInfo = ({ changeMethods }: FieldPropTypes) => {
-  const [uploadOption, setUploadOption] = useState<number>(0);
+const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
+  const [uploadOption, setUploadOption] = useState<number>(1);
   const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
     null,
   );
   return (
     <CredentialInfoForm>
-      <span className="label-select">
-        How do you want to enter service account credentials?
-      </span>
-      <Select
-        defaultValue={CredentialInfoOptions.jsonUpload}
-        style={{ width: '100%' }}
-        onChange={option => setUploadOption(option)}
-      >
-        <Select.Option value={CredentialInfoOptions.jsonUpload}>
-          Upload JSON file
-        </Select.Option>
-        <Select.Option value={CredentialInfoOptions.copyPaste}>
-          Copy and Paste JSON credentials
-        </Select.Option>
-      </Select>
+      {!isEditMode && (
+        <>
+          <span className="label-select">
+            How do you want to enter service account credentials?
+          </span>
+          <Select
+            style={{ width: '100%' }}
+            onChange={option => setUploadOption(option)}
+          >
+            <Select.Option value={CredentialInfoOptions.jsonUpload}>
+              Upload JSON file
+            </Select.Option>
+
+            <Select.Option value={CredentialInfoOptions.copyPaste}>
+              Copy and Paste JSON credentials
+            </Select.Option>
+          </Select>
+        </>
+      )}
       {uploadOption === CredentialInfoOptions.copyPaste ? (
         <div className="input-container" onChange={changeMethods.onChange}>
           <span className="label-select">Service Account</span>
-          <textarea className="input-form" name="encrypted_extra" />
+          <textarea
+            className="input-form"
+            name="encrypted_extra"
+            value={db?.parameters?.credentials_info}
+          />
           <span className="label-paste">
             Copy and paste the entire service account .json file here
           </span>
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 eb94df816575a..ea0bb59e9e2a1 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -229,6 +229,13 @@ function dbReducer(
         ).toString();
       }
 
+      if (action.payload?.parameters?.credentials_info) {
+        // deserialize credentials info for big query editting
+        action.payload.parameters.credentials_info = JSON.stringify(
+          action.payload?.parameters.credentials_info,
+        );
+      }
+
       return {
         ...action.payload,
         engine: trimmedState.engine,
@@ -299,7 +306,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     availableDbs?.databases?.find(
       (available: { engine: string | undefined }) =>
         // TODO: we need a centralized engine in one place
-        available.engine === db?.engine || db?.backend,
+        available.engine === db?.backend || db?.engine,
     ) || {};
 
   // Test Connection logic

From c12a1981fb26537b3ac5732797ca9d7405b44502 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 16 Jun 2021 12:44:36 -0400
Subject: [PATCH 2/7] fix big stoping users from moving to next step

---
 .../data/database/DatabaseModal/index.tsx     | 31 +++++++++++--------
 .../src/views/CRUD/data/database/types.ts     |  5 +++
 superset/db_engine_specs/bigquery.py          |  2 +-
 3 files changed, 24 insertions(+), 14 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
index ea0bb59e9e2a1..90b3c5e40fb16 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -210,17 +210,20 @@ function dbReducer(
     case ActionType.fetched:
       // convert all the keys in this payload into strings
       // eslint-disable-next-line no-case-declarations
-      let extra_json = {
-        ...JSON.parse(action.payload.extra || ''),
-      };
-      extra_json = {
-        ...extra_json,
-        metadata_params: JSON.stringify(extra_json.metadata_params),
-        engine_params: JSON.stringify(extra_json.engine_params),
-        schemas_allowed_for_csv_upload: JSON.stringify(
-          extra_json.schemas_allowed_for_csv_upload,
-        ),
-      };
+      let extra_json = {};
+      if (action.payload.extra) {
+        extra_json = {
+          ...JSON.parse(action.payload.extra || ''),
+        };
+        extra_json = {
+          ...extra_json,
+          metadata_params: JSON.stringify(extra_json.metadata_params),
+          engine_params: JSON.stringify(extra_json.engine_params),
+          schemas_allowed_for_csv_upload: JSON.stringify(
+            extra_json.schemas_allowed_for_csv_upload,
+          ),
+        };
+      }
 
       if (action.payload?.parameters?.query) {
         // convert query into URI params string
@@ -306,7 +309,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     availableDbs?.databases?.find(
       (available: { engine: string | undefined }) =>
         // TODO: we need a centralized engine in one place
-        available.engine === db?.backend || db?.engine,
+        available.engine === (isEditMode ? db?.backend : db?.engine),
     ) || {};
 
   // Test Connection logic
@@ -449,8 +452,10 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   const setDatabaseModel = (engine: string) => {
     const isDynamic =
       availableDbs?.databases.filter(
-        (db: DatabaseObject) => db.engine === engine,
+        (db: DatabaseObject) => db.engine || db.backend === engine,
       )[0].parameters !== undefined;
+
+    console.log('choosing', engine);
     setDB({
       type: ActionType.dbSelected,
       payload: {
diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
index 2598ac7cadec3..bcf241e4c84d5 100644
--- a/superset-frontend/src/views/CRUD/data/database/types.ts
+++ b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -112,6 +112,11 @@ export type DatabaseForm = {
         nullable: boolean;
         type: string;
       };
+      credentials_info: {
+        description: string;
+        nullable: boolean;
+        type: string;
+      };
     };
     required: string[];
     type: string;
diff --git a/superset/db_engine_specs/bigquery.py b/superset/db_engine_specs/bigquery.py
index a22ed2ae6a5f3..ca0a85c12998c 100644
--- a/superset/db_engine_specs/bigquery.py
+++ b/superset/db_engine_specs/bigquery.py
@@ -49,7 +49,7 @@
 
 class BigQueryParametersSchema(Schema):
     credentials_info = EncryptedField(
-        required=True, description="Contents of BigQuery JSON credentials.",
+        required=False, description="Contents of BigQuery JSON credentials.",
     )
 
 

From 64e8e3be126197c1f9a07fffd8ba360f7c1f2e5c Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 16 Jun 2021 12:57:31 -0400
Subject: [PATCH 3/7] fix default

---
 .../data/database/DatabaseModal/DatabaseConnectionForm.tsx     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
index 27bff7cfea5a1..8161f0d95c3b1 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -66,7 +66,7 @@ interface FieldPropTypes {
 }
 
 const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
-  const [uploadOption, setUploadOption] = useState<number>(1);
+  const [uploadOption, setUploadOption] = useState<number>(CredentialInfoOptions.copyPaste.valueOf());
   const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
     null,
   );
@@ -78,6 +78,7 @@ const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
             How do you want to enter service account credentials?
           </span>
           <Select
+            defaultValue={uploadOption}
             style={{ width: '100%' }}
             onChange={option => setUploadOption(option)}
           >

From 9a01bad40131c62863a7f8859ab693c8fb056983 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 16 Jun 2021 12:59:49 -0400
Subject: [PATCH 4/7] save defaults

---
 .../data/database/DatabaseModal/DatabaseConnectionForm.tsx    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
index 8161f0d95c3b1..b52e906368277 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -66,7 +66,9 @@ interface FieldPropTypes {
 }
 
 const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
-  const [uploadOption, setUploadOption] = useState<number>(CredentialInfoOptions.copyPaste.valueOf());
+  const [uploadOption, setUploadOption] = useState<number>(
+    CredentialInfoOptions.copyPaste.valueOf(),
+  );
   const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
     null,
   );

From 79840fb404123297c9555cf8115a3c884baca2de Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 16 Jun 2021 13:15:04 -0400
Subject: [PATCH 5/7] fix tslint

---
 .../data/database/DatabaseModal/index.tsx     | 21 +++++++++----------
 .../src/views/CRUD/data/database/types.ts     |  3 ++-
 2 files changed, 12 insertions(+), 12 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
index 90b3c5e40fb16..6b41dc8273826 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -210,17 +210,18 @@ function dbReducer(
     case ActionType.fetched:
       // convert all the keys in this payload into strings
       // eslint-disable-next-line no-case-declarations
-      let extra_json = {};
+      let deserializeExtraJSON = {};
       if (action.payload.extra) {
-        extra_json = {
+        const extra_json = {
           ...JSON.parse(action.payload.extra || ''),
-        };
-        extra_json = {
-          ...extra_json,
-          metadata_params: JSON.stringify(extra_json.metadata_params),
-          engine_params: JSON.stringify(extra_json.engine_params),
+        } as DatabaseObject['extra_json'];
+
+        deserializeExtraJSON = {
+          ...JSON.parse(action.payload.extra || ''),
+          metadata_params: JSON.stringify(extra_json?.metadata_params),
+          engine_params: JSON.stringify(extra_json?.engine_params),
           schemas_allowed_for_csv_upload: JSON.stringify(
-            extra_json.schemas_allowed_for_csv_upload,
+            extra_json?.schemas_allowed_for_csv_upload,
           ),
         };
       }
@@ -243,7 +244,7 @@ function dbReducer(
         ...action.payload,
         engine: trimmedState.engine,
         configuration_method: trimmedState.configuration_method,
-        extra_json,
+        extra_json: deserializeExtraJSON,
         parameters: {
           ...action.payload.parameters,
           query,
@@ -454,8 +455,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
       availableDbs?.databases.filter(
         (db: DatabaseObject) => db.engine || db.backend === engine,
       )[0].parameters !== undefined;
-
-    console.log('choosing', engine);
     setDB({
       type: ActionType.dbSelected,
       payload: {
diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
index bcf241e4c84d5..f02841d9819d0 100644
--- a/superset-frontend/src/views/CRUD/data/database/types.ts
+++ b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -38,6 +38,7 @@ export type DatabaseObject = {
     username?: string;
     password?: string;
     encryption?: boolean;
+    credentials_info?: string;
     query?: string | object;
   };
   configuration_method: CONFIGURATION_METHOD;
@@ -63,7 +64,7 @@ export type DatabaseObject = {
 
   // Extra
   extra_json?: {
-    engine_params?: {} | string;
+    engine_params?: {} | string | object;
     metadata_params?: {} | string;
     metadata_cache_timeout?: {
       schema_cache_timeout?: number; // in Performance

From 15974f757b699bd257f458df48506945a57d139e Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 16 Jun 2021 13:21:51 -0400
Subject: [PATCH 6/7] remove object

---
 superset-frontend/src/views/CRUD/data/database/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
index f02841d9819d0..3c6fa8a825875 100644
--- a/superset-frontend/src/views/CRUD/data/database/types.ts
+++ b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -64,7 +64,7 @@ export type DatabaseObject = {
 
   // Extra
   extra_json?: {
-    engine_params?: {} | string | object;
+    engine_params?: {} | string;
     metadata_params?: {} | string;
     metadata_cache_timeout?: {
       schema_cache_timeout?: number; // in Performance

From 7f23089ea716f09a5c49f035df2960038d4b691e Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 16 Jun 2021 14:01:18 -0400
Subject: [PATCH 7/7] fix styling

---
 .../src/views/CRUD/data/database/DatabaseModal/index.tsx       | 2 +-
 .../src/views/CRUD/data/database/DatabaseModal/styles.ts       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 6b41dc8273826..2c233ee4f949a 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -473,7 +473,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
       </h4>
       <div className="control-label">Supported databases</div>
       <Select
-        style={{ width: '100%' }}
+        className="available-select"
         onChange={setDatabaseModel}
         placeholder="Choose a database..."
       >
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
index 1a1704bf9df28..8a1a395f114c4 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
@@ -431,6 +431,9 @@ export const SelectDatabaseStyles = styled.div`
       font-weight: bold;
       margin: ${({ theme }) => theme.gridUnit * 6}px 0;
     }
+    .available-select {
+      width: 100%;
+    }
   }
 
   .label-available-select {