Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: DB Connection UI R2 Fixes #15232

Merged
merged 8 commits into from
Jun 17, 2021
+8 −12
Merged

fix: DB Connection UI R2 Fixes #15232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f15fd8d
fix display name refill
hughhhh Jun 17, 2021
b800fd1
fix order of additional params to always be at the bottom
hughhhh Jun 17, 2021
6c04e9a
remove schema check on validation
hughhhh Jun 17, 2021
6c7f8b2
make encryption last
hughhhh Jun 17, 2021
47cd118
fix json file upload
hughhhh Jun 17, 2021
5e8e83e
fix additional params issue
hughhhh Jun 17, 2021
42ac287
remove comments
hughhhh Jun 17, 2021
88ca153
add back validation
hughhhh Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ export const FormFieldOrder = [
'username',
'password',
'database_name',
'credentials_info',
'query',
'encryption',
'credentials_info',
];

const selectedFile = document.getElementById('selectedFile');

interface FieldPropTypes {
required: boolean;
onParametersChange: (value: any) => string;
Expand All @@ -68,7 +66,7 @@ interface FieldPropTypes {

const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
const [uploadOption, setUploadOption] = useState<number>(
CredentialInfoOptions.copyPaste.valueOf(),
CredentialInfoOptions.jsonUpload.valueOf(),
);
const [fileToUpload, setFileToUpload] = useState<string | null | undefined>(
null,
Expand Down Expand Up @@ -153,7 +151,9 @@ const CredentialsInfo = ({ changeMethods, isEditMode, db }: FieldPropTypes) => {
checked: false,
},
});
(selectedFile as HTMLInputElement).value = null as any;
(document.getElementById(
'selectedFile',
) as HTMLInputElement).value = null as any;
}}
/>
</div>
Expand Down Expand Up @@ -269,13 +269,12 @@ const displayField = ({
getValidation,
validationErrors,
db,
defaultDBName,
}: FieldPropTypes) => (
<ValidatedInput
id="database_name"
name="database_name"
required={required}
value={db?.database_name || defaultDBName}
value={db?.database_name}
validationMethods={{ onBlur: getValidation }}
errorMessage={validationErrors?.database_name}
placeholder=""
Expand Down Expand Up @@ -348,7 +347,7 @@ const FORM_FIELD_MAP = {
};

const DatabaseConnectionForm = ({
dbModel: { name: defaultDBName, parameters },
dbModel: { parameters },
onParametersChange,
onChange,
onParametersUploadFileChange,
Expand Down Expand Up @@ -395,7 +394,6 @@ const DatabaseConnectionForm = ({
onChange,
onParametersUploadFileChange,
},
defaultDBName,
validationErrors,
getValidation,
db,
Expand Down
2 changes: 0 additions & 2 deletions superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
.replace(/&/g, '","')
.replace(/=/g, '":"')}"}`,
);
} else if (update.parameters) {
update.parameters.query = {};
}

if (db?.id) {
Expand Down
2 changes: 1 addition & 1 deletion superset/databases/schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ def validate_parameters( # pylint: disable=no-self-use
"""
Validate the DB engine spec specific parameters schema.
"""
# TODO (aafghahi): use a single parameter
# TODO (aafghahi): Move this onCreate instead of validation
engine_spec = get_engine_spec(data.get("engine") or data.get("backend"))
engine_spec.parameters_schema.load(data["parameters"]) # type: ignore

Expand Down