You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by el...@apache.org on 2023/10/20 22:31:19 UTC
[superset] tag 2.1.2 updated (62547ccd05 -> 61837ed41f)
This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a change to tag 2.1.2
in repository https://gitbox.apache.org/repos/asf/superset.git
*** WARNING: tag 2.1.2 was modified! ***
from 62547ccd05 (commit)
to 61837ed41f (commit)
from 62547ccd05 fix: update order of build for testing a release (#24317)
new 3d840d92e6 fix: Allow chart import to update the dataset an existing chart points to (#24821)
new 2a49cda8f1 fix: SSH Tunnel creation with dynamic form (#24196)
new 61837ed41f fix: validation errors appearing after ssh tunnel switch (#24849)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cypress/integration/database/modal.test.ts | 8 +-
superset-frontend/src/types/Database.ts | 1 +
.../DatabaseConnectionForm/CommonParameters.tsx | 34 ++++
.../DatabaseModal/DatabaseConnectionForm/index.tsx | 7 +
.../data/database/DatabaseModal/index.test.tsx | 4 +
.../CRUD/data/database/DatabaseModal/index.tsx | 32 ++--
.../src/views/CRUD/data/database/types.ts | 1 +
superset-frontend/src/views/CRUD/hooks.ts | 209 +++++++++++----------
superset/charts/commands/importers/v1/utils.py | 5 +-
superset/db_engine_specs/base.py | 4 +
superset/models/helpers.py | 18 +-
tests/integration_tests/databases/api_tests.py | 12 ++
.../db_engine_specs/postgres_tests.py | 4 +
13 files changed, 209 insertions(+), 130 deletions(-)
[superset] 02/03: fix: SSH Tunnel creation with dynamic form (#24196)
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a commit to tag 2.1.2
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 2a49cda8f189f223faf91a0df64a3ae2eb055a4b
Author: Hugh A. Miles II <hu...@gmail.com>
AuthorDate: Sun Jul 2 23:48:48 2023 -0400
fix: SSH Tunnel creation with dynamic form (#24196)
(cherry picked from commit 226c7f807dd70239691dc3baaa4d4276a6a4f7c4)
---
.../cypress/integration/database/modal.test.ts | 8 +-
superset-frontend/src/types/Database.ts | 1 +
.../DatabaseConnectionForm/CommonParameters.tsx | 31 +++
.../DatabaseModal/DatabaseConnectionForm/index.tsx | 3 +
.../data/database/DatabaseModal/index.test.tsx | 4 +
.../CRUD/data/database/DatabaseModal/index.tsx | 30 ++-
.../src/views/CRUD/data/database/types.ts | 1 +
superset-frontend/src/views/CRUD/hooks.ts | 209 +++++++++++----------
superset/db_engine_specs/base.py | 4 +
tests/integration_tests/databases/api_tests.py | 12 ++
.../db_engine_specs/postgres_tests.py | 4 +
11 files changed, 184 insertions(+), 123 deletions(-)
diff --git a/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts b/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts
index a3260250aa..3cc34cb64f 100644
--- a/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/database/modal.test.ts
@@ -62,8 +62,8 @@ describe('Add database', () => {
it('show error alerts on dynamic form for bad host', () => {
// click postgres dynamic form
cy.get('.preferred > :nth-child(1)').click();
- cy.get('input[name="host"]').focus().type('badhost');
- cy.get('input[name="port"]').focus().type('5432');
+ cy.get('input[name="host"]').focus().type('badhost', { force: true });
+ cy.get('input[name="port"]').focus().type('5432', { force: true });
cy.get('.ant-form-item-explain-error').contains(
"The hostname provided can't be resolved",
);
@@ -72,8 +72,8 @@ describe('Add database', () => {
it('show error alerts on dynamic form for bad port', () => {
// click postgres dynamic form
cy.get('.preferred > :nth-child(1)').click();
- cy.get('input[name="host"]').focus().type('localhost');
- cy.get('input[name="port"]').focus().type('123');
+ cy.get('input[name="host"]').focus().type('localhost', { force: true });
+ cy.get('input[name="port"]').focus().type('123', { force: true });
cy.get('input[name="database"]').focus();
cy.get('.ant-form-item-explain-error').contains('The port is closed');
});
diff --git a/superset-frontend/src/types/Database.ts b/superset-frontend/src/types/Database.ts
index c4491dbb99..575d69e2f2 100644
--- a/superset-frontend/src/types/Database.ts
+++ b/superset-frontend/src/types/Database.ts
@@ -27,4 +27,5 @@ export default interface Database {
server_cert: string;
sqlalchemy_uri: string;
catalog: object;
+ parameters: any;
}
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
index 99a414012b..7078b49cbc 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
@@ -17,6 +17,7 @@
* under the License.
*/
import React from 'react';
+import { isEmpty } from 'lodash';
import { SupersetTheme, t } from '@superset-ui/core';
import { AntdSwitch } from 'src/components';
import InfoTooltip from 'src/components/InfoTooltip';
@@ -250,3 +251,33 @@ export const forceSSLField = ({
/>
</div>
);
+
+export const SSHTunnelSwitch = ({
+ isEditMode,
+ changeMethods,
+ db,
+}: FieldPropTypes) => (
+ <div css={(theme: SupersetTheme) => infoTooltip(theme)}>
+ <AntdSwitch
+ disabled={isEditMode && !isEmpty(db?.ssh_tunnel)}
+ checked={db?.parameters?.ssh}
+ onChange={changed => {
+ changeMethods.onParametersChange({
+ target: {
+ type: 'toggle',
+ name: 'ssh',
+ checked: true,
+ value: changed,
+ },
+ });
+ }}
+ data-test="ssh-tunnel-switch"
+ />
+ <span css={toggleStyle}>{t('SSH Tunnel')}</span>
+ <InfoTooltip
+ tooltip={t('SSH Tunnel configuration parameters')}
+ placement="right"
+ viewBox="0 -5 24 24"
+ />
+ </div>
+);
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx
index f6284ae67d..5dce73206f 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx
@@ -31,6 +31,7 @@ import {
portField,
queryField,
usernameField,
+ SSHTunnelSwitch,
} from './CommonParameters';
import { validatedInputField } from './ValidatedInputField';
import { EncryptedField } from './EncryptedField';
@@ -55,6 +56,7 @@ export const FormFieldOrder = [
'account',
'warehouse',
'role',
+ 'ssh',
];
export interface FieldPropTypes {
@@ -102,6 +104,7 @@ const FORM_FIELD_MAP = {
warehouse: validatedInputField,
role: validatedInputField,
account: validatedInputField,
+ ssh: SSHTunnelSwitch,
};
interface DatabaseConnectionFormProps {
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx
index 32cc16b04f..cc5eda7d06 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx
@@ -127,6 +127,10 @@ fetchMock.mock(AVAILABLE_DB_ENDPOINT, {
description: 'Additional parameters',
type: 'object',
},
+ ssh: {
+ description: 'Create SSH Tunnel',
+ type: 'boolean',
+ },
username: {
description: 'Username',
nullable: true,
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 fdc41e9e22..97bd916fd6 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -706,15 +706,18 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
});
}
- // make sure that button spinner animates
- setLoading(true);
- const errors = await getValidation(dbToUpdate, true);
- if ((validationErrors && !isEmpty(validationErrors)) || errors) {
+ // only do validation for non ssh tunnel connections
+ if (!dbToUpdate?.ssh_tunnel) {
+ // make sure that button spinner animates
+ setLoading(true);
+ const errors = await getValidation(dbToUpdate, true);
+ if ((validationErrors && !isEmpty(validationErrors)) || errors) {
+ setLoading(false);
+ return;
+ }
+ // end spinner animation
setLoading(false);
- return;
}
- setLoading(false);
- // end spinner animation
const parameters_schema = isEditMode
? dbToUpdate.parameters_schema?.properties
@@ -1431,18 +1434,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
validationErrors={validationErrors}
getPlaceholder={getPlaceholder}
/>
- <SSHTunnelContainer>
- <SSHTunnelSwitchComponent
- isEditMode={isEditMode}
- dbFetched={dbFetched}
- disableSSHTunnelingForEngine={disableSSHTunnelingForEngine}
- useSSHTunneling={useSSHTunneling}
- setUseSSHTunneling={setUseSSHTunneling}
- setDB={setDB}
- isSSHTunneling={isSSHTunneling}
- />
- </SSHTunnelContainer>
- {useSSHTunneling && (
+ {db?.parameters?.ssh && (
<SSHTunnelContainer>{renderSSHTunnelForm()}</SSHTunnelContainer>
)}
</>
diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
index c347948f7e..a6f04c97af 100644
--- a/superset-frontend/src/views/CRUD/data/database/types.ts
+++ b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -68,6 +68,7 @@ export type DatabaseObject = {
warehouse?: string;
role?: string;
account?: string;
+ ssh?: boolean;
};
// Performance
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index 80a6c4793b..8cc03b3115 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -692,123 +692,132 @@ export function useDatabaseValidation() {
null,
);
const getValidation = useCallback(
- (database: Partial<DatabaseObject> | null, onCreate = false) =>
- SupersetClient.post({
- endpoint: '/api/v1/database/validate_parameters/',
- body: JSON.stringify(transformDB(database)),
- headers: { 'Content-Type': 'application/json' },
- })
- .then(() => {
- setValidationErrors(null);
+ (database: Partial<DatabaseObject> | null, onCreate = false) => {
+ if (database?.parameters?.ssh) {
+ // when ssh tunnel is enabled we don't want to render any validation errors
+ setValidationErrors(null);
+ return [];
+ }
+
+ return (
+ SupersetClient.post({
+ endpoint: '/api/v1/database/validate_parameters/',
+ body: JSON.stringify(transformDB(database)),
+ headers: { 'Content-Type': 'application/json' },
})
- // eslint-disable-next-line consistent-return
- .catch(e => {
- if (typeof e.json === 'function') {
- return e.json().then(({ errors = [] }: JsonObject) => {
- const parsedErrors = errors
- .filter((error: { error_type: string }) => {
- const skipValidationError = ![
- 'CONNECTION_MISSING_PARAMETERS_ERROR',
- 'CONNECTION_ACCESS_DENIED_ERROR',
- ].includes(error.error_type);
- return skipValidationError || onCreate;
- })
- .reduce(
- (
- obj: {},
- {
- error_type,
- extra,
- message,
- }: {
- error_type: string;
- extra: {
- invalid?: string[];
- missing?: string[];
- name: string;
- catalog: {
+ .then(() => {
+ setValidationErrors(null);
+ })
+ // eslint-disable-next-line consistent-return
+ .catch(e => {
+ if (typeof e.json === 'function') {
+ return e.json().then(({ errors = [] }: JsonObject) => {
+ const parsedErrors = errors
+ .filter((error: { error_type: string }) => {
+ const skipValidationError = ![
+ 'CONNECTION_MISSING_PARAMETERS_ERROR',
+ 'CONNECTION_ACCESS_DENIED_ERROR',
+ ].includes(error.error_type);
+ return skipValidationError || onCreate;
+ })
+ .reduce(
+ (
+ obj: {},
+ {
+ error_type,
+ extra,
+ message,
+ }: {
+ error_type: string;
+ extra: {
+ invalid?: string[];
+ missing?: string[];
name: string;
- url: string;
- idx: number;
+ catalog: {
+ name: string;
+ url: string;
+ idx: number;
+ };
+ issue_codes?: {
+ code?: number;
+ message?: string;
+ }[];
};
- issue_codes?: {
- code?: number;
- message?: string;
- }[];
- };
- message: string;
- },
- ) => {
- if (extra.catalog) {
- if (extra.catalog.name) {
+ message: string;
+ },
+ ) => {
+ if (extra.catalog) {
+ if (extra.catalog.name) {
+ return {
+ ...obj,
+ error_type,
+ [extra.catalog.idx]: {
+ name: message,
+ },
+ };
+ }
+ if (extra.catalog.url) {
+ return {
+ ...obj,
+ error_type,
+ [extra.catalog.idx]: {
+ url: message,
+ },
+ };
+ }
+
return {
...obj,
error_type,
[extra.catalog.idx]: {
name: message,
+ url: message,
},
};
}
- if (extra.catalog.url) {
+ // if extra.invalid doesn't exist then the
+ // error can't be mapped to a parameter
+ // so leave it alone
+ if (extra.invalid) {
return {
...obj,
+ [extra.invalid[0]]: message,
error_type,
- [extra.catalog.idx]: {
- url: message,
- },
+ };
+ }
+ if (extra.missing) {
+ return {
+ ...obj,
+ error_type,
+ ...Object.assign(
+ {},
+ ...extra.missing.map(field => ({
+ [field]: 'This is a required field',
+ })),
+ ),
+ };
+ }
+ if (extra.issue_codes?.length) {
+ return {
+ ...obj,
+ error_type,
+ description: message || extra.issue_codes[0]?.message,
};
}
- return {
- ...obj,
- error_type,
- [extra.catalog.idx]: {
- name: message,
- url: message,
- },
- };
- }
- // if extra.invalid doesn't exist then the
- // error can't be mapped to a parameter
- // so leave it alone
- if (extra.invalid) {
- return {
- ...obj,
- [extra.invalid[0]]: message,
- error_type,
- };
- }
- if (extra.missing) {
- return {
- ...obj,
- error_type,
- ...Object.assign(
- {},
- ...extra.missing.map(field => ({
- [field]: 'This is a required field',
- })),
- ),
- };
- }
- if (extra.issue_codes?.length) {
- return {
- ...obj,
- error_type,
- description: message || extra.issue_codes[0]?.message,
- };
- }
-
- return obj;
- },
- {},
- );
- setValidationErrors(parsedErrors);
- return parsedErrors;
- });
- }
- // eslint-disable-next-line no-console
- console.error(e);
- }),
+ return obj;
+ },
+ {},
+ );
+ setValidationErrors(parsedErrors);
+ return parsedErrors;
+ });
+ }
+ // eslint-disable-next-line no-console
+ console.error(e);
+ })
+ );
+ },
[setValidationErrors],
);
diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py
index b789bbe70c..63a8044612 100644
--- a/superset/db_engine_specs/base.py
+++ b/superset/db_engine_specs/base.py
@@ -1773,6 +1773,10 @@ class BasicParametersSchema(Schema):
encryption = fields.Boolean(
required=False, description=__("Use an encrypted connection to the database")
)
+ ssh = fields.Boolean(
+ required=False,
+ metadata={"description": __("Use an ssh tunnel connection to the database")},
+ )
class BasicParametersType(TypedDict, total=False):
diff --git a/tests/integration_tests/databases/api_tests.py b/tests/integration_tests/databases/api_tests.py
index f4968edae9..79c1319d59 100644
--- a/tests/integration_tests/databases/api_tests.py
+++ b/tests/integration_tests/databases/api_tests.py
@@ -2437,6 +2437,10 @@ class TestDatabaseApi(SupersetTestCase):
"description": "Additional parameters",
"type": "object",
},
+ "ssh": {
+ "description": "Use an ssh tunnel connection to the database",
+ "type": "boolean",
+ },
"username": {
"description": "Username",
"nullable": True,
@@ -2512,6 +2516,10 @@ class TestDatabaseApi(SupersetTestCase):
"description": "Additional parameters",
"type": "object",
},
+ "ssh": {
+ "description": "Use an ssh tunnel connection to the database",
+ "type": "boolean",
+ },
"username": {
"description": "Username",
"nullable": True,
@@ -2587,6 +2595,10 @@ class TestDatabaseApi(SupersetTestCase):
"description": "Additional parameters",
"type": "object",
},
+ "ssh": {
+ "description": "Use an ssh tunnel connection to the database",
+ "type": "boolean",
+ },
"username": {
"description": "Username",
"nullable": True,
diff --git a/tests/integration_tests/db_engine_specs/postgres_tests.py b/tests/integration_tests/db_engine_specs/postgres_tests.py
index a6145432c2..260b5a2f95 100644
--- a/tests/integration_tests/db_engine_specs/postgres_tests.py
+++ b/tests/integration_tests/db_engine_specs/postgres_tests.py
@@ -511,6 +511,10 @@ def test_base_parameters_mixin():
"description": "Additional parameters",
"additionalProperties": {},
},
+ "ssh": {
+ "description": "Use an ssh tunnel connection to the database",
+ "type": "boolean",
+ },
},
"required": ["database", "host", "port", "username"],
}
[superset] 01/03: fix: Allow chart import to update the dataset an existing chart points to (#24821)
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a commit to tag 2.1.2
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 3d840d92e65ca8c590f45b504fb343e4263f9678
Author: Jack Fragassi <jf...@gmail.com>
AuthorDate: Fri Jul 28 16:08:03 2023 -0700
fix: Allow chart import to update the dataset an existing chart points to (#24821)
---
superset/charts/commands/importers/v1/utils.py | 5 ++++-
superset/models/helpers.py | 18 +++++++++++++-----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/superset/charts/commands/importers/v1/utils.py b/superset/charts/commands/importers/v1/utils.py
index d4aeb17a1e..bbbe67db92 100644
--- a/superset/charts/commands/importers/v1/utils.py
+++ b/superset/charts/commands/importers/v1/utils.py
@@ -46,7 +46,10 @@ def import_chart(
# TODO (betodealmeida): move this logic to import_from_dict
config["params"] = json.dumps(config["params"])
- chart = Slice.import_from_dict(session, config, recursive=False)
+ chart = Slice.import_from_dict(
+ session, config, recursive=False, allow_reparenting=True
+ )
+
if chart.id is None:
session.flush()
diff --git a/superset/models/helpers.py b/superset/models/helpers.py
index bce9970884..59db27d404 100644
--- a/superset/models/helpers.py
+++ b/superset/models/helpers.py
@@ -184,7 +184,7 @@ class ImportExportMixin:
__mapper__: Mapper
@classmethod
- def _unique_constrains(cls) -> List[Set[str]]:
+ def _unique_constraints(cls) -> list[set[str]]:
"""Get all (single column and multi column) unique constraints"""
unique = [
{c.name for c in u.columns}
@@ -245,7 +245,12 @@ class ImportExportMixin:
dict_rep: Dict[Any, Any],
parent: Optional[Any] = None,
recursive: bool = True,
+<<<<<<< HEAD
sync: Optional[List[str]] = None,
+=======
+ sync: Optional[list[str]] = None,
+ allow_reparenting: bool = False,
+>>>>>>> 77889b29f... fix: Allow chart import to update the dataset an existing chart points to (#24821)
) -> Any:
"""Import obj from a dictionary"""
if sync is None:
@@ -258,7 +263,7 @@ class ImportExportMixin:
| {"uuid"}
)
new_children = {c: dict_rep[c] for c in cls.export_children if c in dict_rep}
- unique_constrains = cls._unique_constrains()
+ unique_constraints = cls._unique_constraints()
filters = [] # Using these filters to check if obj already exists
@@ -279,8 +284,11 @@ class ImportExportMixin:
for k, v in parent_refs.items():
dict_rep[k] = getattr(parent, v)
- # Add filter for parent obj
- filters.extend([getattr(cls, k) == dict_rep.get(k) for k in parent_refs.keys()])
+ if not allow_reparenting:
+ # Add filter for parent obj
+ filters.extend(
+ [getattr(cls, k) == dict_rep.get(k) for k in parent_refs.keys()]
+ )
# Add filter for unique constraints
ucs = [
@@ -291,7 +299,7 @@ class ImportExportMixin:
if dict_rep.get(k) is not None
]
)
- for cs in unique_constrains
+ for cs in unique_constraints
]
filters.append(or_(*ucs))
[superset] 03/03: fix: validation errors appearing after ssh tunnel switch (#24849)
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elizabeth pushed a commit to tag 2.1.2
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 61837ed41f55a3abe4116c2402c97914770fed31
Author: Hugh A. Miles II <hu...@gmail.com>
AuthorDate: Wed Aug 2 17:41:37 2023 -0400
fix: validation errors appearing after ssh tunnel switch (#24849)
(cherry picked from commit b71541fb7fb1bdfd3e1eea59ee76de1f51e67e6b)
---
.../DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx | 3 +++
.../CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx | 4 ++++
.../src/views/CRUD/data/database/DatabaseModal/index.tsx | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
index 7078b49cbc..7b52eab26c 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/CommonParameters.tsx
@@ -49,6 +49,7 @@ export const hostField = ({
onChange={changeMethods.onParametersChange}
/>
);
+
export const portField = ({
required,
changeMethods,
@@ -255,6 +256,7 @@ export const forceSSLField = ({
export const SSHTunnelSwitch = ({
isEditMode,
changeMethods,
+ clearValidationErrors,
db,
}: FieldPropTypes) => (
<div css={(theme: SupersetTheme) => infoTooltip(theme)}>
@@ -270,6 +272,7 @@ export const SSHTunnelSwitch = ({
value: changed,
},
});
+ clearValidationErrors();
}}
data-test="ssh-tunnel-switch"
/>
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx
index 5dce73206f..e747b3c895 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/index.tsx
@@ -79,6 +79,7 @@ export interface FieldPropTypes {
};
validationErrors: JsonObject | null;
getValidation: () => void;
+ clearValidationErrors: () => void;
db?: DatabaseObject;
field: string;
isEditMode?: boolean;
@@ -132,6 +133,7 @@ interface DatabaseConnectionFormProps {
onRemoveTableCatalog: (idx: number) => void;
validationErrors: JsonObject | null;
getValidation: () => void;
+ clearValidationErrors: () => void;
getPlaceholder?: (field: string) => string | undefined;
}
@@ -151,6 +153,7 @@ const DatabaseConnectionForm = ({
onRemoveTableCatalog,
sslForced,
validationErrors,
+ clearValidationErrors,
}: DatabaseConnectionFormProps) => (
<Form>
<div
@@ -179,6 +182,7 @@ const DatabaseConnectionForm = ({
},
validationErrors,
getValidation,
+ clearValidationErrors,
db,
key: field,
field,
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 97bd916fd6..63c38e3e10 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -267,7 +267,6 @@ export function dbReducer(
};
case ActionType.extraInputChange:
// "extra" payload in state is a string
-
if (
action.payload.name === 'schema_cache_timeout' ||
action.payload.name === 'table_cache_timeout'
@@ -1433,6 +1432,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
getValidation={() => getValidation(db)}
validationErrors={validationErrors}
getPlaceholder={getPlaceholder}
+ clearValidationErrors={() => setValidationErrors(null)}
/>
{db?.parameters?.ssh && (
<SSHTunnelContainer>{renderSSHTunnelForm()}</SSHTunnelContainer>