{t('Adjust performance settings of this database.')}
+
+ ),
+ children: (
+ <>
+
+
{t('Chart cache timeout')}
{t(
- 'Force all tables and views to be created in this schema when clicking CTAS or CVAS in SQL Lab.',
+ 'Duration (in seconds) of the caching timeout for charts of this database.' +
+ ' A timeout of 0 indicates that the cache never expires, and -1 bypasses the cache.' +
+ ' Note this defaults to the global timeout if undefined.',
)}
-
-
-
-
-
+
{t('Schema cache timeout')}
+
+
+
+
+ {t(
+ 'Duration (in seconds) of the metadata caching timeout for schemas of ' +
+ 'this database. If left unset, the cache never expires.',
)}
- />
-
-
-
-
-
-
+
+
+
{t('Table cache timeout')}
+
+
+
+
+ {t(
+ 'Duration (in seconds) of the metadata caching timeout for tables of ' +
+ 'this database. If left unset, the cache never expires. ',
)}
- />
-
-
-
-
-
-
+
+
+
+
+
+ {isAllowRunAsyncDisabled && (
+
)}
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{t('Performance')}
-
- {t('Adjust performance settings of this database.')}
-
-
- }
- key="2"
- >
-
-
{t('Chart cache timeout')}
-
-
-
-
- {t(
- 'Duration (in seconds) of the caching timeout for charts of this database.' +
- ' A timeout of 0 indicates that the cache never expires, and -1 bypasses the cache.' +
- ' Note this defaults to the global timeout if undefined.',
- )}
-
-
-
-
{t('Schema cache timeout')}
-
-
-
-
- {t(
- 'Duration (in seconds) of the metadata caching timeout for schemas of ' +
- 'this database. If left unset, the cache never expires.',
- )}
-
-
-
-
{t('Table cache timeout')}
-
-
-
-
- {t(
- 'Duration (in seconds) of the metadata caching timeout for tables of ' +
- 'this database. If left unset, the cache never expires. ',
- )}
-
- {t(
- 'JSON string containing additional connection configuration. ' +
- 'This is used to provide connection information for systems ' +
- 'like Hive, Presto and BigQuery which do not conform to the ' +
- 'username:password syntax normally used by SQLAlchemy.',
- )}
+
{t('Security')}
+
{t('Add extra connection information.')}
-
-
-
-
{t('Root certificate')}
-
-
-
-
- {t(
- 'Optional CA_BUNDLE contents to validate HTTPS requests. Only ' +
- 'available on certain database engines.',
- )}
-
+ {t(
+ 'JSON string containing additional connection configuration. ' +
+ 'This is used to provide connection information for systems ' +
+ 'like Hive, Presto and BigQuery which do not conform to the ' +
+ 'username:password syntax normally used by SQLAlchemy.',
+ )}
+
+
+
+
+
{t('Root certificate')}
+
+
+
+
+ {t(
+ 'Optional CA_BUNDLE contents to validate HTTPS requests. Only ' +
+ 'available on certain database engines.',
+ )}
+
+
+
- {extraExtension?.title}
-
-
-
-
-
- }
- key={extraExtension?.title}
- // @ts-ignore, 'icon' is valid in >=4.9.0 but missing from `CollapsibleType`
- collapsible={extraExtension.enabled?.() ? 'icon' : 'disabled'}
- >
-
-
-
-
- )}
-
-
+ {t(
+ 'The engine_params object gets unpacked into the sqlalchemy.create_engine call.',
+ )}
+
+
+
+
+
+ {t('Version')}
+
+
+
+
+
+ {t(
+ 'Specify the database version. This is used with Presto for query cost ' +
+ 'estimation, and Dremio for syntax changes, among others.',
+ )}
+
+
+
+
+
+
+
+
+ {supportsDynamicCatalog && (
+
+
+
+
+
+
)}
-
-
-
-
-
- {t('Version')}
-
-
-
-
-
- {t(
- 'Specify the database version. This is used with Presto for query cost ' +
- 'estimation, and Dremio for syntax changes, among others.',
- )}
-
-
-
-
-
-
-
-
- {supportsDynamicCatalog && (
-
-
-
-
-
-
- )}
-
-
+
+ ),
+ },
+ ]}
+ />
);
};
diff --git a/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx b/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx
index 1edb3bd7cc0..4be033d4117 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx
+++ b/superset-frontend/src/features/databases/DatabaseModal/index.test.tsx
@@ -563,37 +563,37 @@ describe('DatabaseModal', () => {
const advancedTab = screen.getByRole('tab', { name: /advanced/i });
// - Advanced tabs
const sqlLabTab = screen.getByRole('tab', {
- name: /right sql lab adjust how this database will interact with sql lab\./i,
+ name: /collapsed sql lab adjust how this database will interact with sql lab\./i,
});
const sqlLabTabArrow = within(sqlLabTab).getByRole('img', {
- name: /right/i,
+ name: /collapsed/i,
});
const sqlLabTabHeading = screen.getByRole('heading', {
name: /sql lab/i,
});
const performanceTab = screen.getByRole('tab', {
- name: /right performance adjust performance settings of this database\./i,
+ name: /collapsed performance adjust performance settings of this database\./i,
});
const performanceTabArrow = within(performanceTab).getByRole('img', {
- name: /right/i,
+ name: /collapsed/i,
});
const performanceTabHeading = screen.getByRole('heading', {
name: /performance/i,
});
const securityTab = screen.getByRole('tab', {
- name: /right security add extra connection information\./i,
+ name: /collapsed security add extra connection information\./i,
});
const securityTabArrow = within(securityTab).getByRole('img', {
- name: /right/i,
+ name: /collapsed/i,
});
const securityTabHeading = screen.getByRole('heading', {
name: /security/i,
});
const otherTab = screen.getByRole('tab', {
- name: /right other additional settings\./i,
+ name: /collapsed other additional settings\./i,
});
const otherTabArrow = within(otherTab).getByRole('img', {
- name: /right/i,
+ name: /collapsed/i,
});
const otherTabHeading = screen.getByRole('heading', { name: /other/i });
// renderModalFooter() - Advanced tab's footer
@@ -646,7 +646,7 @@ describe('DatabaseModal', () => {
// Click the "SQL Lab" tab
userEvent.click(
await screen.findByRole('tab', {
- name: /right sql lab adjust how this database will interact with sql lab\./i,
+ name: /collapsed sql lab adjust how this database will interact with sql lab\./i,
}),
);
expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
@@ -674,7 +674,7 @@ describe('DatabaseModal', () => {
});
// - Advanced tabs
const sqlLabTab = screen.getByRole('tab', {
- name: /right sql lab adjust how this database will interact with sql lab\./i,
+ name: /expanded sql lab adjust how this database will interact with sql lab\./i,
});
// These are the checkbox SVGs that cover the actual checkboxes
const checkboxOffSVGs = screen.getAllByRole('img', {
@@ -814,7 +814,7 @@ describe('DatabaseModal', () => {
// Click the "Performance" tab
userEvent.click(
screen.getByRole('tab', {
- name: /right performance adjust performance settings of this database\./i,
+ name: /collapsed performance adjust performance settings of this database\./i,
}),
);
expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
@@ -839,10 +839,10 @@ describe('DatabaseModal', () => {
const advancedTab = screen.getByRole('tab', { name: /advanced/i });
// - Advanced tabs
const sqlLabTab = screen.getByRole('tab', {
- name: /right sql lab adjust how this database will interact with sql lab\./i,
+ name: /collapsed sql lab adjust how this database will interact with sql lab\./i,
});
const performanceTab = screen.getByRole('tab', {
- name: /right performance adjust performance settings of this database\./i,
+ name: /expanded performance adjust performance settings of this database\./i,
});
// ---------- Assertions ----------
@@ -879,7 +879,7 @@ describe('DatabaseModal', () => {
// Click the "Security" tab
userEvent.click(
screen.getByRole('tab', {
- name: /right security add extra connection information\./i,
+ name: /collapsed security add extra connection information\./i,
}),
);
expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
@@ -904,13 +904,13 @@ describe('DatabaseModal', () => {
const advancedTab = screen.getByRole('tab', { name: /advanced/i });
// - Advanced tabs
const sqlLabTab = screen.getByRole('tab', {
- name: /right sql lab adjust how this database will interact with sql lab\./i,
+ name: /collapsed sql lab adjust how this database will interact with sql lab\./i,
});
const performanceTab = screen.getByRole('tab', {
- name: /right performance adjust performance settings of this database\./i,
+ name: /collapsed performance adjust performance settings of this database\./i,
});
const securityTab = screen.getByRole('tab', {
- name: /right security add extra connection information\./i,
+ name: /expanded security add extra connection information\./i,
});
const allowFileUploadCheckbox = screen.getByRole('checkbox', {
name: /Allow file uploads to database/i,
@@ -965,7 +965,7 @@ describe('DatabaseModal', () => {
// Click the "Security" tab
userEvent.click(
screen.getByRole('tab', {
- name: /right security add extra connection information\./i,
+ name: /collapsed security add extra connection information\./i,
}),
);
// Click the "Allow file uploads" tab
@@ -995,13 +995,13 @@ describe('DatabaseModal', () => {
const advancedTab = screen.getByRole('tab', { name: /advanced/i });
// - Advanced tabs
const sqlLabTab = screen.getByRole('tab', {
- name: /right sql lab adjust how this database will interact with sql lab\./i,
+ name: /collapsed sql lab adjust how this database will interact with sql lab\./i,
});
const performanceTab = screen.getByRole('tab', {
- name: /right performance adjust performance settings of this database\./i,
+ name: /collapsed performance adjust performance settings of this database\./i,
});
const securityTab = screen.getByRole('tab', {
- name: /right security add extra connection information\./i,
+ name: /expanded security add extra connection information\./i,
});
const allowFileUploadText = screen.getByText(
/Allow file uploads to database/i,
@@ -1053,7 +1053,7 @@ describe('DatabaseModal', () => {
// Click the "Other" tab
userEvent.click(
screen.getByRole('tab', {
- name: /right other additional settings\./i,
+ name: /collapsed other additional settings\./i,
}),
);
expect(await screen.findByText(/step 2 of 2/i)).toBeInTheDocument();
@@ -1078,16 +1078,16 @@ describe('DatabaseModal', () => {
const advancedTab = screen.getByRole('tab', { name: /advanced/i });
// - Advanced tabs
const sqlLabTab = screen.getByRole('tab', {
- name: /right sql lab adjust how this database will interact with sql lab\./i,
+ name: /collapsed sql lab adjust how this database will interact with sql lab\./i,
});
const performanceTab = screen.getByRole('tab', {
- name: /right performance adjust performance settings of this database\./i,
+ name: /collapsed performance adjust performance settings of this database\./i,
});
const securityTab = screen.getByRole('tab', {
- name: /right security add extra connection information\./i,
+ name: /collapsed security add extra connection information\./i,
});
const otherTab = screen.getByRole('tab', {
- name: /right other additional settings\./i,
+ name: /expanded other additional settings\./i,
});
// ---------- Assertions ----------
@@ -1484,7 +1484,7 @@ describe('DatabaseModal', () => {
// Click the "Security" tab
userEvent.click(
screen.getByRole('tab', {
- name: /right security add extra connection information\./i,
+ name: /collapsed security add extra connection information\./i,
}),
);
diff --git a/superset-frontend/src/features/databases/DatabaseModal/styles.ts b/superset-frontend/src/features/databases/DatabaseModal/styles.ts
index 182a5ce61a6..7db6312a4b6 100644
--- a/superset-frontend/src/features/databases/DatabaseModal/styles.ts
+++ b/superset-frontend/src/features/databases/DatabaseModal/styles.ts
@@ -26,8 +26,6 @@ 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;
-
export const no_margin_bottom = css`
margin-bottom: 0;
`;
@@ -83,30 +81,6 @@ export const StyledFormHeader = styled.header`
}
`;
-export const antdCollapseStyles = (theme: SupersetTheme) => css`
- .ant-collapse-header {
- background-color: ${theme.colorBgLayout};
- padding-top: ${theme.sizeUnit * 3.5}px;
- padding-bottom: ${theme.sizeUnit * 2.5}px;
-
- .anticon.ant-collapse-arrow {
- top: calc(50% - ${anticonHeight / 2}px);
- }
- .helper {
- color: ${theme.colors.grayscale.base};
- }
- }
- h4 {
- font-size: 16px;
- margin-top: 0;
- margin-bottom: ${theme.sizeUnit}px;
- }
- p.helper {
- margin: ${theme.sizeUnit * 3}px ${theme.sizeUnit * 4}px;
- margin-left: 0px;
- }
-`;
-
export const antDTabsStyles = css`
.antd5-tabs-top {
margin-top: 0;
diff --git a/superset-frontend/src/features/databases/UploadDataModel/index.tsx b/superset-frontend/src/features/databases/UploadDataModel/index.tsx
index 7be9e56940f..21e24d44fa3 100644
--- a/superset-frontend/src/features/databases/UploadDataModel/index.tsx
+++ b/superset-frontend/src/features/databases/UploadDataModel/index.tsx
@@ -44,7 +44,6 @@ import rison from 'rison';
import withToasts from 'src/components/MessageToasts/withToasts';
import { Form } from 'src/components/Form';
import {
- antdCollapseStyles,
antDModalNoPaddingStyles,
antDModalStyles,
formStyles,
@@ -594,440 +593,473 @@ const UploadDataModal: FunctionComponent = ({
expandIconPosition="right"
accordion
defaultActiveKey="general"
- css={(theme: SupersetTheme) => antdCollapseStyles(theme)}
- >
-
-
+ {t(
+ 'Adjust column settings such as specifying the columns to read, how duplicates are handled, column data types, and more.',
)}
- name="column_data_types"
- >
-
-
-
-
- )}
-
-