This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new cbd3fa2190 fix: do not close database modal on mask click (#28750)
cbd3fa2190 is described below
commit cbd3fa2190a72cac6f6b57c62bec71e3cecf4240
Author: Elizabeth Thompson <[email protected]>
AuthorDate: Wed May 29 13:53:35 2024 -0700
fix: do not close database modal on mask click (#28750)
---
.../src/features/databases/DatabaseModal/index.tsx | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/superset-frontend/src/features/databases/DatabaseModal/index.tsx
b/superset-frontend/src/features/databases/DatabaseModal/index.tsx
index 4e1e58ebb8..abd9aff064 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/index.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/index.tsx
@@ -1727,35 +1727,36 @@ const DatabaseModal:
FunctionComponent<DatabaseModalProps> = ({
) {
return (
<Modal
+ centered
css={(theme: SupersetTheme) => [
antDModalNoPaddingStyles,
antDModalStyles(theme),
formHelperStyles(theme),
formStyles(theme),
]}
+ footer={renderModalFooter()}
+ maskClosable={false}
name="database"
- onHandledPrimaryAction={onSave}
onHide={onClose}
+ onHandledPrimaryAction={onSave}
primaryButtonName={t('Connect')}
- width="500px"
- centered
show={show}
title={<h4>{t('Connect a database')}</h4>}
- footer={renderModalFooter()}
+ width="500px"
>
<ModalHeader
- isLoading={isLoading}
- isEditMode={isEditMode}
- useSqlAlchemyForm={useSqlAlchemyForm}
- hasConnectedDb={hasConnectedDb}
db={db}
dbName={dbName}
dbModel={dbModel}
fileList={fileList}
+ hasConnectedDb={hasConnectedDb}
+ isEditMode={isEditMode}
+ isLoading={isLoading}
+ useSqlAlchemyForm={useSqlAlchemyForm}
/>
- {passwordNeededField()}
{confirmOverwriteField()}
{importingErrorAlert()}
+ {passwordNeededField()}
</Modal>
);
}
@@ -1783,6 +1784,7 @@ const DatabaseModal:
FunctionComponent<DatabaseModalProps> = ({
<h4>{isEditMode ? t('Edit database') : t('Connect a database')}</h4>
}
footer={modalFooter}
+ maskClosable={false}
>
<StyledStickyHeader>
<TabHeader>
@@ -1942,6 +1944,7 @@ const DatabaseModal:
FunctionComponent<DatabaseModalProps> = ({
show={show}
title={<h4>{t('Connect a database')}</h4>}
footer={renderModalFooter()}
+ maskClosable={false}
>
{!isLoading && hasConnectedDb ? (
<>
