QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-12 19:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Native time range filter in legacy charts (#23865)

Browse Source
This commit is contained in:
Kamil Gabryjelski
2023-05-01 18:57:20 +02:00
committed by Elizabeth Thompson
parent 3c44e6d639
commit 7155dcd5df
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
superset-frontend/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts
View File

@@ -22,12 +22,16 @@ import {
D3_FORMAT_DOCS, D3_FORMAT_DOCS,
D3_TIME_FORMAT_OPTIONS, D3_TIME_FORMAT_OPTIONS,
getStandardizedControls, getStandardizedControls,
sections,
} from '@superset-ui/chart-controls'; } from '@superset-ui/chart-controls';
const config: ControlPanelConfig = { const config: ControlPanelConfig = {
controlPanelSections: [ controlPanelSections: [
sections.legacyRegularTime, {
label: t('Time'),
expanded: true,
description: t('Time related form attributes'),
controlSetRows: [['granularity_sqla'], ['time_range']],
},
{ {
label: t('Query'), label: t('Query'),
expanded: true, expanded: true,

8
superset/utils/core.py
View File

@@ -1159,6 +1159,14 @@ def merge_extra_form_data(form_data: Dict[str, Any]) -> None:
for fltr in append_filters for fltr in append_filters
if fltr if fltr
) )
if (
form_data.get("time_range")
and not form_data.get("granularity")
and not form_data.get("granularity_sqla")
):
for adhoc_filter in form_data.get("adhoc_filters", []):
if adhoc_filter.get("operator") == "TEMPORAL_RANGE":
adhoc_filter["comparator"] = form_data["time_range"]
def merge_extra_filters(form_data: Dict[str, Any]) -> None: def merge_extra_filters(form_data: Dict[str, Any]) -> None: