You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by aa...@apache.org on 2022/09/02 16:14:54 UTC
[superset] branch master updated: fix: DB connection modal connect bug (#21299)
This is an automated email from the ASF dual-hosted git repository.
aafghahi 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 99a4f05069 fix: DB connection modal connect bug (#21299)
99a4f05069 is described below
commit 99a4f05069d4b9de0b266a035423e3165408b4c3
Author: AAfghahi <48...@users.noreply.github.com>
AuthorDate: Fri Sep 2 12:14:39 2022 -0400
fix: DB connection modal connect bug (#21299)
---
.../src/views/CRUD/data/database/DatabaseModal/index.test.jsx | 3 +++
.../src/views/CRUD/data/database/DatabaseModal/index.tsx | 10 ++++++----
.../src/views/CRUD/data/database/DatabaseModal/styles.ts | 3 ++-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
index 79a11b0b13..6df6d5759b 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.jsx
@@ -271,6 +271,7 @@ describe('DatabaseModal', () => {
hidden: true,
});
+ const footer = document.getElementsByClassName('ant-modal-footer');
// ---------- TODO (lyndsiWilliams): Selector options, can't seem to get these to render properly.
// renderAvailableSelector() => <Alert> - Supported databases alert
@@ -312,6 +313,8 @@ describe('DatabaseModal', () => {
visibleComponents.forEach(component => {
expect(component).toBeVisible();
});
+ // there should be a footer but it should not have any buttons in it
+ expect(footer[0]).toBeEmptyDOMElement();
// This is how many preferred databases are rendered
expect(preferredDbIcon).toHaveLength(4);
});
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 a4451822af..6af5333357 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -847,7 +847,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
const renderModalFooter = () => {
if (db) {
- // if db show back + connenct
+ // if db show back + connect
if (!hasConnectedDb || editNewDb) {
return (
<>
@@ -901,7 +901,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
);
}
- return [];
+ return <></>;
};
const renderEditModalFooter = (db: Partial<DatabaseObject> | null) => (
@@ -1302,7 +1302,9 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
</Modal>
);
}
-
+ const modalFooter = isEditMode
+ ? renderEditModalFooter(db)
+ : renderModalFooter();
return useTabLayout ? (
<Modal
css={(theme: SupersetTheme) => [
@@ -1323,7 +1325,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
title={
<h4>{isEditMode ? t('Edit database') : t('Connect a database')}</h4>
}
- footer={isEditMode ? renderEditModalFooter(db) : renderModalFooter()}
+ footer={modalFooter}
>
<StyledStickyHeader>
<TabHeader>
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 9e085169af..31b3f84031 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
@@ -24,6 +24,7 @@ import Button from 'src/components/Button';
const CTAS_CVAS_SCHEMA_FORM_HEIGHT = 108;
const EXPOSE_IN_SQLLAB_FORM_HEIGHT = CTAS_CVAS_SCHEMA_FORM_HEIGHT + 153;
const EXPOSE_ALL_FORM_HEIGHT = EXPOSE_IN_SQLLAB_FORM_HEIGHT + 102;
+const MODAL_BODY_HEIGHT = 180.5;
const anticonHeight = 12;
@@ -156,7 +157,7 @@ export const antDModalStyles = (theme: SupersetTheme) => css`
}
.ant-modal-body {
- height: ${theme.gridUnit * 180.5}px;
+ height: ${theme.gridUnit * MODAL_BODY_HEIGHT}px;
}
.ant-modal-footer {