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.

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

feat(SQL Lab): Make SQL Lab explore use the default viz from the config file #20056

Merged
merged 9 commits into from
Jun 22, 2022
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
exploreChart({
...EXPLORE_CHART_DEFAULT,
datasource: `${datasetToOverwrite.datasetId}__table`,
all_columns: query.results.selected_columns.map(
(d: { name: string; type: string; is_dttm: boolean }) => d.name,
),
selected_columns: query.results.selected_columns,
});
};

Expand Down Expand Up @@ -243,8 +241,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
metrics: [],
groupby: [],
time_range: 'No filter',
viz_type: 'table',
all_columns: selectedColumns.map(c => c.name),
selectedColumns,
row_limit: 1000,
});
})
Expand Down
1 change: 0 additions & 1 deletion superset-frontend/src/SqlLab/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export const EXPLORE_CHART_DEFAULT = {
metrics: [],
groupby: [],
time_range: 'No filter',
viz_type: 'table',
};

export interface DatasetOwner {
Expand Down
2 changes: 1 addition & 1 deletion superset/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def _try_json_readsha(filepath: str, length: int) -> Optional[str]:
# can be replaced at build time to expose build information.
BUILD_NUMBER = None

# default viz used in chart explorer
# default viz used in chart explorer & SQL Lab explore
DEFAULT_VIZ_TYPE = "table"

# default row limit when requesting chart data
Expand Down
13 changes: 13 additions & 0 deletions superset/views/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,19 @@ def explore(
if not viz_type and datasource and datasource.default_endpoint:
return redirect(datasource.default_endpoint)

selectedColumns = []

if "selectedColumns" in form_data:
selectedColumns = form_data.pop("selectedColumns")

if "viz_type" not in form_data:
form_data["viz_type"] = app.config["DEFAULT_VIZ_TYPE"]
if app.config["DEFAULT_VIZ_TYPE"] == "table":
all_columns = []
for x in selectedColumns:
all_columns.append(x["name"])
form_data["all_columns"] = all_columns

# slc perms
slice_add_perm = security_manager.can_access("can_write", "Chart")
slice_overwrite_perm = is_owner(slc, g.user) if slc else False
Expand Down