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: Stop [Object object] from appearing on the Additional Params #15298

Merged
merged 1 commit into from
Jun 22, 2021
+26 −24
Merged

fix: Stop [Object object] from appearing on the Additional Params #15298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 26 additions & 24 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 @@ -357,48 +357,50 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { id, ...update } = db || {};

if (update.configuration_method === CONFIGURATION_METHOD.DYNAMIC_FORM) {
if (update?.parameters?.query) {
// Clone DB object
const dbToUpdate = JSON.parse(JSON.stringify(update));
if (dbToUpdate.configuration_method === CONFIGURATION_METHOD.DYNAMIC_FORM) {
if (dbToUpdate?.parameters?.query) {
// convert query params into dictionary
update.parameters.query = JSON.parse(
`{"${decodeURI((update?.parameters?.query as string) || '')
dbToUpdate.parameters.query = JSON.parse(
`{"${decodeURI((dbToUpdate?.parameters?.query as string) || '')
.replace(/"/g, '\\"')
.replace(/&/g, '","')
.replace(/=/g, '":"')}"}`,
);
} else if (update?.parameters?.query === '') {
update.parameters.query = {};
} else if (dbToUpdate?.parameters?.query === '') {
dbToUpdate.parameters.query = {};
}

const engine = update.backend || update.engine;
if (engine === 'bigquery' && update.parameters?.credentials_info) {
const engine = dbToUpdate.backend || dbToUpdate.engine;
if (engine === 'bigquery' && dbToUpdate.parameters?.credentials_info) {
// wrap encrypted_extra in credentials_info only for BigQuery
update.encrypted_extra = JSON.stringify({
credentials_info: JSON.parse(update.parameters?.credentials_info),
dbToUpdate.encrypted_extra = JSON.stringify({
credentials_info: JSON.parse(dbToUpdate.parameters?.credentials_info),
});
}
}

if (db?.id) {
if (update?.extra_json) {
if (dbToUpdate?.extra_json) {
// convert extra_json to back to string
update.extra = JSON.stringify({
...update.extra_json,
dbToUpdate.extra = JSON.stringify({
...dbToUpdate.extra_json,
metadata_params: JSON.parse(
update?.extra_json?.metadata_params as string,
dbToUpdate?.extra_json?.metadata_params as string,
),
engine_params: JSON.parse(
update?.extra_json?.engine_params as string,
dbToUpdate?.extra_json?.engine_params as string,
),
schemas_allowed_for_csv_upload: JSON.parse(
update?.extra_json?.schemas_allowed_for_csv_upload as string,
dbToUpdate?.extra_json?.schemas_allowed_for_csv_upload as string,
),
});
}
setLoading(true);
const result = await updateResource(
db.id as number,
update as DatabaseObject,
dbToUpdate as DatabaseObject,
);
if (result) {
if (onDatabaseAdd) {
Expand All @@ -408,23 +410,23 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
}
} else if (db) {
// Create
if (update?.extra_json) {
if (dbToUpdate?.extra_json) {
// convert extra_json to back to string
update.extra = JSON.stringify({
...update.extra_json,
dbToUpdate.extra = JSON.stringify({
...dbToUpdate.extra_json,
metadata_params: JSON.parse(
update?.extra_json?.metadata_params as string,
dbToUpdate?.extra_json?.metadata_params as string,
),
engine_params: JSON.parse(
update?.extra_json?.engine_params as string,
dbToUpdate?.extra_json?.engine_params as string,
),
schemas_allowed_for_csv_upload: JSON.parse(
update?.extra_json?.schemas_allowed_for_csv_upload as string,
dbToUpdate?.extra_json?.schemas_allowed_for_csv_upload as string,
),
});
}
setLoading(true);
const dbId = await createResource(update as DatabaseObject);
const dbId = await createResource(dbToUpdate as DatabaseObject);
if (dbId) {
setHasConnectedDb(true);
if (onDatabaseAdd) {
Expand Down