QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-21 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add Private Google Sheets to dynamic form (#16628)

Browse Source 
* first pass private gsheets

* made encrypted extra into string, refactored onParametersChanged

* private sheets working, credential_info errors

* all but test connection working

* first pass private gsheets

* made encrypted extra into string, refactored onParametersChanged

* private sheets working, credential_info errors

* all but test connection working

* Regenerate package-lock.json

Co-authored-by: Beto Dealmeida <roberto@dealmeida.net>
This commit is contained in:
AAfghahi
2021-09-28 20:08:50 -04:00
committed by GitHub
parent b35645c3f4
commit aa747219ad
12 changed files with 4123 additions and 42863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
View File

@@ -180,6 +180,7 @@ type DBReducerActionType =
database_name?: string;
engine?: string;
configuration_method: CONFIGURATION_METHOD;
paramProperties?: Record<string, any>;
};
}
| {
@@ -358,47 +359,27 @@ function dbReducer(
.join('&');
if (
action.payload.backend === 'bigquery' &&
action.payload.encrypted_extra &&
action.payload.configuration_method ===
CONFIGURATION_METHOD.DYNAMIC_FORM
) {
const engineParamsCatalog = Object.keys(
extra_json?.engine_params?.catalog || {},
).map(e => ({
name: e,
value: extra_json?.engine_params?.catalog[e],
}));
return {
...action.payload,
engine: action.payload.backend,
engine: action.payload.backend || trimmedState.engine,
configuration_method: action.payload.configuration_method,
extra_json: deserializeExtraJSON,
parameters: {
credentials_info: JSON.stringify(
action.payload?.parameters?.credentials_info || '',
),
query,
},
catalog: engineParamsCatalog,
parameters: action.payload.parameters,
query_input,
};
}
if (
action.payload.backend === 'gsheets' &&
action.payload.configuration_method ===
CONFIGURATION_METHOD.DYNAMIC_FORM &&
extra_json?.engine_params?.catalog !== undefined
) {
// pull catalog from engine params
const engineParamsCatalog = extra_json?.engine_params?.catalog;
return {
...action.payload,
engine: action.payload.backend,
configuration_method: action.payload.configuration_method,
extra_json: deserializeExtraJSON,
catalog: Object.keys(engineParamsCatalog).map(e => ({
name: e,
value: engineParamsCatalog[e],
})),
query_input,
} as DatabaseObject;
}
return {
...action.payload,
encrypted_extra: action.payload.encrypted_extra || '',
@@ -513,7 +494,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
encrypted_extra: db?.encrypted_extra || '',
server_cert: db?.server_cert || undefined,
};
testDatabaseConnection(connection, addDangerToast, addSuccessToast);
};
@@ -525,11 +505,9 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
setEditNewDb(false);
onHide();
};
const onSave = async () => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { id, ...update } = db || {};
// Clone DB object
const dbToUpdate = JSON.parse(JSON.stringify(update));
@@ -539,32 +517,41 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
if (validationErrors && !isEmpty(validationErrors)) {
return;
}
const parameters_schema = isEditMode
? dbToUpdate.parameters_schema.properties
: dbModel?.parameters.properties;
const additionalEncryptedExtra = JSON.parse(
dbToUpdate.encrypted_extra || '{}',
);
const paramConfigArray = Object.keys(parameters_schema || {});
const engine = dbToUpdate.backend || dbToUpdate.engine;
if (engine === 'bigquery' && dbToUpdate.parameters?.credentials_info) {
// wrap encrypted_extra in credentials_info only for BigQuery
paramConfigArray.forEach(paramConfig => {
/*
* Parameters that are annotated with the `x-encrypted-extra` properties should be moved to
* `encrypted_extra`, so that they are stored encrypted in the backend when the database is
* created or edited.
*/
if (
dbToUpdate.parameters?.credentials_info &&
typeof dbToUpdate.parameters?.credentials_info === 'object' &&
dbToUpdate.parameters?.credentials_info.constructor === Object
parameters_schema[paramConfig]['x-encrypted-extra'] &&
dbToUpdate.parameters?.[paramConfig]
) {
// Don't cast if object
dbToUpdate.encrypted_extra = JSON.stringify({
credentials_info: dbToUpdate.parameters?.credentials_info,
});
// Convert credentials info string before updating
dbToUpdate.parameters.credentials_info = JSON.stringify(
dbToUpdate.parameters.credentials_info,
);
} else {
dbToUpdate.encrypted_extra = JSON.stringify({
credentials_info: JSON.parse(
dbToUpdate.parameters?.credentials_info,
),
});
if (typeof dbToUpdate.parameters?.[paramConfig] === 'object') {
// add new encrypted extra to encrypted_extra object
additionalEncryptedExtra[paramConfig] =
dbToUpdate.parameters?.[paramConfig];
// The backend expects `encrypted_extra` as a string for historical reasons.
dbToUpdate.parameters[paramConfig] = JSON.stringify(
dbToUpdate.parameters[paramConfig],
);
} else {
additionalEncryptedExtra[paramConfig] = JSON.parse(
dbToUpdate.parameters?.[paramConfig] || '{}',
);
}
}
}
});
// cast the new encrypted extra object into a string
dbToUpdate.encrypted_extra = JSON.stringify(additionalEncryptedExtra);
}
if (dbToUpdate?.parameters?.catalog) {
@@ -660,10 +647,11 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
type: ActionType.dbSelected,
payload: {
database_name,
engine,
configuration_method: isDynamic
? CONFIGURATION_METHOD.DYNAMIC_FORM
: CONFIGURATION_METHOD.SQLALCHEMY_URI,
engine,
paramProperties: parameters?.properties,
},
});
}