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 80a73a6f80b8e..77f6109db52a9 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -146,6 +146,7 @@ enum ActionType {
extraEditorChange,
addTableCatalogSheet,
removeTableCatalogSheet,
+ queryChange,
}
interface DBReducerPayloadType {
@@ -163,6 +164,7 @@ type DBReducerActionType =
| ActionType.extraEditorChange
| ActionType.extraInputChange
| ActionType.textChange
+ | ActionType.queryChange
| ActionType.inputChange
| ActionType.editorChange
| ActionType.parametersChange;
@@ -205,7 +207,8 @@ function dbReducer(
const trimmedState = {
...(state || {}),
};
- let query = '';
+ let query = {};
+ let query_input = '';
let deserializeExtraJSON = {};
let extra_json: DatabaseObject['extra_json'];
@@ -318,6 +321,15 @@ function dbReducer(
...trimmedState,
[action.payload.name]: action.payload.json,
};
+ case ActionType.queryChange:
+ return {
+ ...trimmedState,
+ parameters: {
+ ...trimmedState.parameters,
+ query: Object.fromEntries(new URLSearchParams(action.payload.value)),
+ },
+ query_input: action.payload.value,
+ };
case ActionType.textChange:
return {
...trimmedState,
@@ -339,16 +351,17 @@ function dbReducer(
};
}
+ // convert query to a string and store in query_input
+ query = action.payload?.parameters?.query || {};
+ query_input = Object.entries(query)
+ .map(([key, value]) => `${key}=${value}`)
+ .join('&');
+
if (
action.payload.backend === 'bigquery' &&
action.payload.configuration_method ===
CONFIGURATION_METHOD.DYNAMIC_FORM
) {
- // convert query into URI params string
- query = new URLSearchParams(
- action?.payload?.parameters?.query as string,
- ).toString();
-
return {
...action.payload,
engine: action.payload.backend,
@@ -360,6 +373,7 @@ function dbReducer(
),
query,
},
+ query_input,
};
}
@@ -381,37 +395,18 @@ function dbReducer(
name: e,
value: engineParamsCatalog[e],
})),
+ query_input,
} as DatabaseObject;
}
- if (action.payload?.parameters?.query) {
- // convert query into URI params string
- query = new URLSearchParams(
- action.payload.parameters.query as string,
- ).toString();
-
- return {
- ...action.payload,
- encrypted_extra: action.payload.encrypted_extra || '',
- engine: action.payload.backend || trimmedState.engine,
- configuration_method: action.payload.configuration_method,
- extra_json: deserializeExtraJSON,
- parameters: {
- ...action.payload.parameters,
- query,
- },
- };
- }
-
return {
...action.payload,
encrypted_extra: action.payload.encrypted_extra || '',
engine: action.payload.backend || trimmedState.engine,
configuration_method: action.payload.configuration_method,
extra_json: deserializeExtraJSON,
- parameters: {
- ...action.payload.parameters,
- },
+ parameters: action.payload.parameters,
+ query_input,
};
case ActionType.dbSelected:
@@ -539,17 +534,6 @@ const DatabaseModal: FunctionComponent = ({
const dbToUpdate = JSON.parse(JSON.stringify(update));
if (dbToUpdate.configuration_method === CONFIGURATION_METHOD.DYNAMIC_FORM) {
- if (dbToUpdate?.parameters?.query) {
- // convert query params into dictionary
- const urlParams = new URLSearchParams(dbToUpdate?.parameters?.query);
- dbToUpdate.parameters.query = Object.fromEntries(urlParams);
- } else if (
- dbToUpdate?.parameters?.query === '' &&
- 'query' in dbModel.parameters.properties
- ) {
- dbToUpdate.parameters.query = {};
- }
-
// Validate DB before saving
await getValidation(dbToUpdate, true);
if (validationErrors && !isEmpty(validationErrors)) {
@@ -991,6 +975,12 @@ const DatabaseModal: FunctionComponent = ({
value: target.value,
})
}
+ onQueryChange={({ target }: { target: HTMLInputElement }) =>
+ onChange(ActionType.queryChange, {
+ name: target.name,
+ value: target.value,
+ })
+ }
onAddTableCatalog={() =>
setDB({ type: ActionType.addTableCatalogSheet })
}
@@ -1112,6 +1102,12 @@ const DatabaseModal: FunctionComponent = ({
value: target.value,
})
}
+ onQueryChange={({ target }: { target: HTMLInputElement }) =>
+ onChange(ActionType.queryChange, {
+ name: target.name,
+ value: target.value,
+ })
+ }
onAddTableCatalog={() =>
setDB({ type: ActionType.addTableCatalogSheet })
}
@@ -1258,6 +1254,12 @@ const DatabaseModal: FunctionComponent = ({
onAddTableCatalog={() => {
setDB({ type: ActionType.addTableCatalogSheet });
}}
+ onQueryChange={({ target }: { target: HTMLInputElement }) =>
+ onChange(ActionType.queryChange, {
+ name: target.name,
+ value: target.value,
+ })
+ }
onRemoveTableCatalog={(idx: number) => {
setDB({
type: ActionType.removeTableCatalogSheet,
diff --git a/superset-frontend/src/views/CRUD/data/database/types.ts b/superset-frontend/src/views/CRUD/data/database/types.ts
index f6341d34ee857..d473ba50aac7c 100644
--- a/superset-frontend/src/views/CRUD/data/database/types.ts
+++ b/superset-frontend/src/views/CRUD/data/database/types.ts
@@ -45,15 +45,12 @@ export type DatabaseObject = {
password?: string;
encryption?: boolean;
credentials_info?: string;
- query?: string | object;
- catalog?: {};
+ query?: Record;
+ catalog?: Record;
};
configuration_method: CONFIGURATION_METHOD;
engine?: string;
- // Gsheets temporary storage
- catalog?: Array;
-
// Performance
cache_timeout?: string;
allow_run_async?: boolean;
@@ -85,11 +82,14 @@ export type DatabaseObject = {
allows_virtual_table_explore?: boolean; // in SQL Lab
schemas_allowed_for_csv_upload?: string[]; // in Security
cancel_query_on_windows_unload?: boolean; // in Performance
- version?: string;
- // todo: ask beto where this should live
- cost_query_enabled?: boolean; // in SQL Lab
+ version?: string;
+ cost_estimate_enabled?: boolean; // in SQL Lab
};
+
+ // Temporary storage
+ catalog?: Array;
+ query_input?: string;
extra?: string;
};