From eb5f6075a5b10bbada22df483f8a1df2a82ef4af Mon Sep 17 00:00:00 2001
From: Arash <arash.afghahi@gmail.com>
Date: Thu, 8 Jul 2021 17:55:35 -0400
Subject: [PATCH 1/6] first draft

---
 .../DatabaseModal/DatabaseConnectionForm.tsx  | 52 ++++++++++++++-----
 .../data/database/DatabaseModal/index.tsx     | 15 +++++-
 2 files changed, 54 insertions(+), 13 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 ca4fd3a3af54..0ae851420055 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -66,6 +66,7 @@ interface FieldPropTypes {
   sslForced?: boolean;
   defaultDBName?: string;
   editNewDb?: boolean;
+  setPublicSheets: (value: string) => void;
 }
 
 const CredentialsInfo = ({
@@ -299,19 +300,42 @@ const displayField = ({
   getValidation,
   validationErrors,
   db,
+  setPublicSheets,
 }: FieldPropTypes) => (
-  <ValidatedInput
-    id="database_name"
-    name="database_name"
-    required
-    value={db?.database_name}
-    validationMethods={{ onBlur: getValidation }}
-    errorMessage={validationErrors?.database_name}
-    placeholder=""
-    label="Display Name"
-    onChange={changeMethods.onChange}
-    helpText={t('Pick a nickname for this database to display as in Superset.')}
-  />
+  <>
+    <ValidatedInput
+      id="database_name"
+      name="database_name"
+      required
+      value={db?.database_name}
+      validationMethods={{ onBlur: getValidation }}
+      errorMessage={validationErrors?.database_name}
+      placeholder=""
+      label="Display Name"
+      onChange={changeMethods.onChange}
+      helpText={t(
+        'Pick a nickname for this database to display as in Superset.',
+      )}
+    />
+
+    {db?.engine === 'gsheets' && (
+      <>
+        <FormLabel required>{t('Type of Google Sheets Allowed')}</FormLabel>
+        <Select
+          style={{ width: '100%' }}
+          onChange={(value: string) => setPublicSheets(value)}
+          defaultValue="true"
+        >
+          <Select.Option value="true" key={1}>
+            Publicly shared sheets only
+          </Select.Option>
+          <Select.Option value="false" key={2}>
+            Public and privately shared sheets
+          </Select.Option>
+        </Select>
+      </>
+    )}
+  </>
 );
 
 const queryField = ({
@@ -388,10 +412,13 @@ const DatabaseConnectionForm = ({
   isEditMode = false,
   sslForced,
   editNewDb,
+  setPublicSheets,
 }: {
   isEditMode?: boolean;
   sslForced: boolean;
   editNewDb?: boolean;
+  isPublic?: boolean;
+  setPublicSheets: (value: string) => void;
   dbModel: DatabaseForm;
   db: Partial<DatabaseObject> | null;
   onParametersChange: (
@@ -434,6 +461,7 @@ const DatabaseConnectionForm = ({
             isEditMode,
             sslForced,
             editNewDb,
+            setPublicSheets,
           }),
         )}
     </div>
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 6c397d41d6b1..df5c8ab13030 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -338,6 +338,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   const [dbName, setDbName] = useState('');
   const [editNewDb, setEditNewDb] = useState<boolean>(false);
   const [isLoading, setLoading] = useState<boolean>(false);
+  const [isPublic, setPublic] = useState<boolean>(true);
   const conf = useCommonConf();
   const dbImages = getDatabaseImages();
   const connectionAlert = getConnectionAlert();
@@ -360,7 +361,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     t('database'),
     addDangerToast,
   );
-
+  console.log(isPublic);
   const isDynamic = (engine: string | undefined) =>
     availableDbs?.databases.filter(
       (DB: DatabaseObject) => DB.backend === engine || DB.engine === engine,
@@ -530,6 +531,14 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     }
   };
 
+  const setPublicSheets = (value: string) => {
+    if (value === 'true') {
+      setPublic(true);
+    } else {
+      setPublic(false);
+    }
+  };
+
   const setDatabaseModel = (engine: string) => {
     const selectedDbModel = availableDbs?.databases.filter(
       (db: DatabaseObject) => db.engine === engine,
@@ -802,6 +811,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         isEditMode
         sslForced={sslForced}
         dbModel={dbModel}
+        setPublicSheets={setPublicSheets}
         db={db as DatabaseObject}
         onParametersChange={({ target }: { target: HTMLInputElement }) =>
           onChange(ActionType.parametersChange, {
@@ -912,6 +922,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           ) : (
             <DatabaseConnectionForm
               isEditMode
+              isPublic
+              setPublicSheets={setPublicSheets}
               sslForced={sslForced}
               dbModel={dbModel}
               db={db as DatabaseObject}
@@ -1070,6 +1082,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
                 )}
                 <DatabaseConnectionForm
                   db={db}
+                  setPublicSheets={setPublicSheets}
                   sslForced={sslForced}
                   dbModel={dbModel}
                   onParametersChange={({

From 459eba381f38d2e1581acd6746801c850a7edcb9 Mon Sep 17 00:00:00 2001
From: Arash <arash.afghahi@gmail.com>
Date: Fri, 9 Jul 2021 13:24:53 -0400
Subject: [PATCH 2/6] added table_catalog

---
 .../DatabaseModal/DatabaseConnectionForm.tsx  | 150 ++++++++++--------
 .../data/database/DatabaseModal/index.tsx     |   4 +-
 2 files changed, 88 insertions(+), 66 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 0ae851420055..c151a067586e 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -46,6 +46,7 @@ export const FormFieldOrder = [
   'password',
   'database_name',
   'credentials_info',
+  'table_catalog',
   'query',
   'encryption',
 ];
@@ -67,6 +68,7 @@ interface FieldPropTypes {
   defaultDBName?: string;
   editNewDb?: boolean;
   setPublicSheets: (value: string) => void;
+  isPublic?: boolean;
 }
 
 const CredentialsInfo = ({
@@ -74,6 +76,7 @@ const CredentialsInfo = ({
   isEditMode,
   db,
   editNewDb,
+  isPublic,
 }: FieldPropTypes) => {
   const [uploadOption, setUploadOption] = useState<number>(
     CredentialInfoOptions.jsonUpload.valueOf(),
@@ -81,9 +84,10 @@ const CredentialsInfo = ({
   const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
     null,
   );
+  console.log('in credentials', isPublic);
   return (
     <CredentialInfoForm>
-      {!isEditMode && (
+      {!isEditMode && db?.engine === 'bigquery' && (
         <>
           <FormLabel required>
             {t('How do you want to enter service account credentials?')}
@@ -105,9 +109,10 @@ const CredentialsInfo = ({
       )}
       {uploadOption === CredentialInfoOptions.copyPaste ||
       isEditMode ||
-      editNewDb ? (
+      editNewDb ||
+      (db?.engine === 'gsheets' && !isPublic) ? (
         <div className="input-container">
-          <FormLabel required>{t('Service Account')}</FormLabel>
+          <FormLabel required>{t('Service Account Information')}</FormLabel>
           <textarea
             className="input-form"
             name="credentials_info"
@@ -116,78 +121,90 @@ const CredentialsInfo = ({
             placeholder="Paste content of service credentials JSON file here"
           />
           <span className="label-paste">
-            {t('Copy and paste the entire service account .json file here')}
+            {t(
+              'Copy and paste the entire service account .json file here to enable connection',
+            )}
           </span>
         </div>
       ) : (
-        <div
-          className="input-container"
-          css={(theme: SupersetTheme) => infoTooltip(theme)}
-        >
-          <div css={{ display: 'flex', alignItems: 'center' }}>
-            <FormLabel required>{t('Upload Credentials')}</FormLabel>
-            <InfoTooltip
-              tooltip={t(
-                'Use the JSON file you automatically downloaded when creating your service account in Google BigQuery.',
-              )}
-              viewBox="0 0 24 24"
-            />
-          </div>
-
-          {!fileToUpload && (
-            <Button
-              className="input-upload-btn"
-              onClick={() => document?.getElementById('selectedFile')?.click()}
-            >
-              {t('Choose File')}
-            </Button>
-          )}
-          {fileToUpload && (
-            <div className="input-upload-current">
-              {fileToUpload}
-              <DeleteFilled
-                onClick={() => {
-                  setFileToUpload(null);
-                  changeMethods.onParametersChange({
-                    target: {
-                      name: 'credentials_info',
-                      value: '',
-                    },
-                  });
-                }}
+        db?.engine !== 'gsheets' && (
+          <div
+            className="input-container"
+            css={(theme: SupersetTheme) => infoTooltip(theme)}
+          >
+            <div css={{ display: 'flex', alignItems: 'center' }}>
+              <FormLabel required>{t('Upload Credentials')}</FormLabel>
+              <InfoTooltip
+                tooltip={t(
+                  'Use the JSON file you automatically downloaded when creating your service account in Google BigQuery.',
+                )}
+                viewBox="0 0 24 24"
               />
             </div>
-          )}
-
-          <input
-            id="selectedFile"
-            className="input-upload"
-            type="file"
-            onChange={async event => {
-              let file;
-              if (event.target.files) {
-                file = event.target.files[0];
-              }
-              setFileToUpload(file?.name);
-              changeMethods.onParametersChange({
-                target: {
-                  type: null,
-                  name: 'credentials_info',
-                  value: await file?.text(),
-                  checked: false,
-                },
-              });
-              (document.getElementById(
-                'selectedFile',
-              ) as HTMLInputElement).value = null as any;
-            }}
-          />
-        </div>
+            )
+            {!fileToUpload && (
+              <Button
+                className="input-upload-btn"
+                onClick={() =>
+                  document?.getElementById('selectedFile')?.click()
+                }
+              >
+                {t('Choose File')}
+              </Button>
+            )}
+            {fileToUpload && (
+              <div className="input-upload-current">
+                {fileToUpload}
+                <DeleteFilled
+                  onClick={() => {
+                    setFileToUpload(null);
+                    changeMethods.onParametersChange({
+                      target: {
+                        name: 'credentials_info',
+                        value: '',
+                      },
+                    });
+                  }}
+                />
+              </div>
+            )}
+            <input
+              id="selectedFile"
+              className="input-upload"
+              type="file"
+              onChange={async event => {
+                let file;
+                if (event.target.files) {
+                  file = event.target.files[0];
+                }
+                setFileToUpload(file?.name);
+                changeMethods.onParametersChange({
+                  target: {
+                    type: null,
+                    name: 'credentials_info',
+                    value: await file?.text(),
+                    checked: false,
+                  },
+                });
+                (document.getElementById(
+                  'selectedFile',
+                ) as HTMLInputElement).value = null as any;
+              }}
+            />
+          </div>
+        )
       )}
     </CredentialInfoForm>
   );
 };
 
+const TableCatalog = ({
+  changeMethods,
+  isEditMode,
+  db,
+  editNewDb,
+}: FieldPropTypes) => <>hello! {db?.engine}</>;
+
 const hostField = ({
   required,
   changeMethods,
@@ -399,6 +416,7 @@ const FORM_FIELD_MAP = {
   query: queryField,
   encryption: forceSSLField,
   credentials_info: CredentialsInfo,
+  table_catalog: TableCatalog,
 };
 
 const DatabaseConnectionForm = ({
@@ -413,6 +431,7 @@ const DatabaseConnectionForm = ({
   sslForced,
   editNewDb,
   setPublicSheets,
+  isPublic,
 }: {
   isEditMode?: boolean;
   sslForced: boolean;
@@ -462,6 +481,7 @@ const DatabaseConnectionForm = ({
             sslForced,
             editNewDb,
             setPublicSheets,
+            isPublic,
           }),
         )}
     </div>
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 df5c8ab13030..814dd3eba693 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -808,6 +808,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     }
     return (
       <DatabaseConnectionForm
+        isPublic={isPublic}
         isEditMode
         sslForced={sslForced}
         dbModel={dbModel}
@@ -922,7 +923,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           ) : (
             <DatabaseConnectionForm
               isEditMode
-              isPublic
+              isPublic={isPublic}
               setPublicSheets={setPublicSheets}
               sslForced={sslForced}
               dbModel={dbModel}
@@ -1081,6 +1082,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
                   </StyledAlertMargin>
                 )}
                 <DatabaseConnectionForm
+                  isPublic={isPublic}
                   db={db}
                   setPublicSheets={setPublicSheets}
                   sslForced={sslForced}

From 9aba8fc2287db53ec6cbe9f84c1e8f9cfd75c9d1 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 12 Jul 2021 11:01:00 -0700
Subject: [PATCH 3/6] remove console.log

---
 .../CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx | 2 +-
 .../src/views/CRUD/data/database/DatabaseModal/index.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 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 c151a067586e..9cee5a73fb18 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -84,7 +84,7 @@ const CredentialsInfo = ({
   const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
     null,
   );
-  console.log('in credentials', isPublic);
+
   return (
     <CredentialInfoForm>
       {!isEditMode && db?.engine === 'bigquery' && (
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 814dd3eba693..503c4e1883c8 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -361,7 +361,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     t('database'),
     addDangerToast,
   );
-  console.log(isPublic);
+
   const isDynamic = (engine: string | undefined) =>
     availableDbs?.databases.filter(
       (DB: DatabaseObject) => DB.backend === engine || DB.engine === engine,

From 6b30f795240024679674bdfb25225c186e1458b7 Mon Sep 17 00:00:00 2001
From: AAfghahi <48933336+AAfghahi@users.noreply.github.com>
Date: Tue, 13 Jul 2021 10:10:33 -0400
Subject: [PATCH 4/6] Update
 superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx

Co-authored-by: Beto Dealmeida <roberto@dealmeida.net>
---
 .../CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 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 9cee5a73fb18..450ca7a52bb8 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -127,7 +127,7 @@ const CredentialsInfo = ({
           </span>
         </div>
       ) : (
-        db?.engine !== 'gsheets' && (
+        db?.engine === 'bigquery' && (
           <div
             className="input-container"
             css={(theme: SupersetTheme) => infoTooltip(theme)}

From 962e5972f16fec593138cce9e89835261b62531b Mon Sep 17 00:00:00 2001
From: AAfghahi <48933336+AAfghahi@users.noreply.github.com>
Date: Tue, 13 Jul 2021 10:33:13 -0400
Subject: [PATCH 5/6] Update
 superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx

Co-authored-by: Beto Dealmeida <roberto@dealmeida.net>
---
 .../src/views/CRUD/data/database/DatabaseModal/index.tsx        | 2 +-
 1 file changed, 1 insertion(+), 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 503c4e1883c8..0d93e5da2973 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -1082,8 +1082,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
                   </StyledAlertMargin>
                 )}
                 <DatabaseConnectionForm
-                  isPublic={isPublic}
                   db={db}
+                  isPublic={isPublic}
                   setPublicSheets={setPublicSheets}
                   sslForced={sslForced}
                   dbModel={dbModel}

From 0e4f2499a245ee328c9d012bfcd8682fd6f5ad04 Mon Sep 17 00:00:00 2001
From: Arash <arash.afghahi@gmail.com>
Date: Tue, 13 Jul 2021 12:46:58 -0400
Subject: [PATCH 6/6] revisions

---
 .../DatabaseModal/DatabaseConnectionForm.tsx  | 133 ++++++++++++------
 .../data/database/DatabaseModal/index.tsx     |  15 +-
 .../src/views/CRUD/data/database/types.ts     |   1 +
 3 files changed, 92 insertions(+), 57 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 c151a067586e..b533698986cb 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { FormEvent, useState } from 'react';
+import React, { FormEvent, useState, Dispatch, SetStateAction } from 'react';
 import { SupersetTheme, JsonObject, t } from '@superset-ui/core';
 import { InputProps } from 'antd/lib/input';
 import { Switch, Select, Button } from 'src/common/components';
@@ -67,7 +67,7 @@ interface FieldPropTypes {
   sslForced?: boolean;
   defaultDBName?: string;
   editNewDb?: boolean;
-  setPublicSheets: (value: string) => void;
+  setPublic: Dispatch<SetStateAction<boolean>>;
   isPublic?: boolean;
 }
 
@@ -84,7 +84,6 @@ const CredentialsInfo = ({
   const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
     null,
   );
-  console.log('in credentials', isPublic);
   return (
     <CredentialInfoForm>
       {!isEditMode && db?.engine === 'bigquery' && (
@@ -199,11 +198,47 @@ const CredentialsInfo = ({
 };
 
 const TableCatalog = ({
+  required,
   changeMethods,
   isEditMode,
+  getValidation,
   db,
   editNewDb,
-}: FieldPropTypes) => <>hello! {db?.engine}</>;
+  validationErrors,
+}: FieldPropTypes) => {
+  const [tableCatalog, setTableCatalog] = useState<Record<string, string>>(
+    db?.parameters?.table_catalog || {},
+  );
+  return (
+    <div>
+      {Object.keys(tableCatalog).map(field => (
+        <>
+          <ValidatedInput
+            id="table_catalog_name"
+            name="table_catalog_name"
+            required={required}
+            value={field}
+            validationMethods={{ onBlur: getValidation }}
+            errorMessage={validationErrors?.table_catalog}
+            placeholder="Create a name for this sheet"
+            label="Google Sheet name and url"
+            onChange={changeMethods.onParametersChange}
+          />
+          <ValidatedInput
+            id="table_catalog_value"
+            name="table_catalog_value"
+            required={required}
+            value={tableCatalog[field]}
+            validationMethods={{ onBlur: getValidation }}
+            errorMessage={validationErrors?.table_catalog}
+            placeholder="Paste the shareable Google Sheet URL here"
+            onChange={changeMethods.onParametersChange}
+          />
+        </>
+      ))}
+    </div>
+  );
+};
 
 const hostField = ({
   required,
@@ -312,48 +347,56 @@ const passwordField = ({
     onChange={changeMethods.onParametersChange}
   />
 );
-const displayField = ({
+const DisplayField = ({
   changeMethods,
   getValidation,
   validationErrors,
   db,
-  setPublicSheets,
-}: FieldPropTypes) => (
-  <>
-    <ValidatedInput
-      id="database_name"
-      name="database_name"
-      required
-      value={db?.database_name}
-      validationMethods={{ onBlur: getValidation }}
-      errorMessage={validationErrors?.database_name}
-      placeholder=""
-      label="Display Name"
-      onChange={changeMethods.onChange}
-      helpText={t(
-        'Pick a nickname for this database to display as in Superset.',
-      )}
-    />
+  setPublic,
+}: FieldPropTypes) => {
+  const setBooleanToString = (value: string): boolean => {
+    if (value === 'true') {
+      return true;
+    }
+    return false;
+  };
+  return (
+    <>
+      <ValidatedInput
+        id="database_name"
+        name="database_name"
+        required
+        value={db?.database_name}
+        validationMethods={{ onBlur: getValidation }}
+        errorMessage={validationErrors?.database_name}
+        placeholder=""
+        label="Display Name"
+        onChange={changeMethods.onChange}
+        helpText={t(
+          'Pick a nickname for this database to display as in Superset.',
+        )}
+      />
 
-    {db?.engine === 'gsheets' && (
-      <>
-        <FormLabel required>{t('Type of Google Sheets Allowed')}</FormLabel>
-        <Select
-          style={{ width: '100%' }}
-          onChange={(value: string) => setPublicSheets(value)}
-          defaultValue="true"
-        >
-          <Select.Option value="true" key={1}>
-            Publicly shared sheets only
-          </Select.Option>
-          <Select.Option value="false" key={2}>
-            Public and privately shared sheets
-          </Select.Option>
-        </Select>
-      </>
-    )}
-  </>
-);
+      {db?.engine === 'gsheets' && (
+        <>
+          <FormLabel required>{t('Type of Google Sheets Allowed')}</FormLabel>
+          <Select
+            style={{ width: '100%' }}
+            onChange={(value: string) => setPublic(setBooleanToString(value))}
+            defaultValue="true"
+          >
+            <Select.Option value="true" key={1}>
+              Publicly shared sheets only
+            </Select.Option>
+            <Select.Option value="false" key={2}>
+              Public and privately shared sheets
+            </Select.Option>
+          </Select>
+        </>
+      )}
+    </>
+  );
+};
 
 const queryField = ({
   required,
@@ -412,7 +455,7 @@ const FORM_FIELD_MAP = {
   database: databaseField,
   username: usernameField,
   password: passwordField,
-  database_name: displayField,
+  database_name: DisplayField,
   query: queryField,
   encryption: forceSSLField,
   credentials_info: CredentialsInfo,
@@ -430,14 +473,14 @@ const DatabaseConnectionForm = ({
   isEditMode = false,
   sslForced,
   editNewDb,
-  setPublicSheets,
+  setPublic,
   isPublic,
 }: {
   isEditMode?: boolean;
   sslForced: boolean;
   editNewDb?: boolean;
   isPublic?: boolean;
-  setPublicSheets: (value: string) => void;
+  setPublic: Dispatch<SetStateAction<boolean>>;
   dbModel: DatabaseForm;
   db: Partial<DatabaseObject> | null;
   onParametersChange: (
@@ -480,7 +523,7 @@ const DatabaseConnectionForm = ({
             isEditMode,
             sslForced,
             editNewDb,
-            setPublicSheets,
+            setPublic,
             isPublic,
           }),
         )}
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 814dd3eba693..72f86cb8282f 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -361,7 +361,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     t('database'),
     addDangerToast,
   );
-  console.log(isPublic);
   const isDynamic = (engine: string | undefined) =>
     availableDbs?.databases.filter(
       (DB: DatabaseObject) => DB.backend === engine || DB.engine === engine,
@@ -531,14 +530,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     }
   };
 
-  const setPublicSheets = (value: string) => {
-    if (value === 'true') {
-      setPublic(true);
-    } else {
-      setPublic(false);
-    }
-  };
-
   const setDatabaseModel = (engine: string) => {
     const selectedDbModel = availableDbs?.databases.filter(
       (db: DatabaseObject) => db.engine === engine,
@@ -809,10 +800,10 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     return (
       <DatabaseConnectionForm
         isPublic={isPublic}
+        setPublic={setPublic}
         isEditMode
         sslForced={sslForced}
         dbModel={dbModel}
-        setPublicSheets={setPublicSheets}
         db={db as DatabaseObject}
         onParametersChange={({ target }: { target: HTMLInputElement }) =>
           onChange(ActionType.parametersChange, {
@@ -924,7 +915,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
             <DatabaseConnectionForm
               isEditMode
               isPublic={isPublic}
-              setPublicSheets={setPublicSheets}
+              setPublic={setPublic}
               sslForced={sslForced}
               dbModel={dbModel}
               db={db as DatabaseObject}
@@ -1084,7 +1075,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
                 <DatabaseConnectionForm
                   isPublic={isPublic}
                   db={db}
-                  setPublicSheets={setPublicSheets}
+                  setPublic={setPublic}
                   sslForced={sslForced}
                   dbModel={dbModel}
                   onParametersChange={({
diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
index 3c6fa8a82587..031e49d15b66 100644
--- a/superset-frontend/src/views/CRUD/data/database/types.ts
+++ b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -40,6 +40,7 @@ export type DatabaseObject = {
     encryption?: boolean;
     credentials_info?: string;
     query?: string | object;
+    table_catalog?: Record<string, string>;
   };
   configuration_method: CONFIGURATION_METHOD;
   engine?: string;