This is an automated email from the ASF dual-hosted git repository. elizabeth pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/superset.git
commit dbd4f91c96d44ecc69739196e05c461fe995a243 Author: Ville Brofeldt <[email protected]> AuthorDate: Tue Mar 28 14:08:52 2023 +0300 fix(generic-x-axis): skip initial time filter for legacy charts (#23506) (cherry picked from commit 8db5cb18c01ee8c9ee1fb3dc60c3af32682c47f7) --- .../superset-ui-chart-controls/src/shared-controls/mixins.tsx | 4 +++- superset-frontend/src/explore/components/ControlPanelsContainer.tsx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx index 0b19b96c7f..1db389ddec 100644 --- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx +++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/mixins.tsx @@ -73,9 +73,11 @@ export const datePickerInAdhocFilterMixin: Pick< initialValue: (control: ControlState, state: ControlPanelState | null) => { // skip initialValue if // 1) GENERIC_CHART_AXES is disabled - // 2) there was a time filter in adhoc filters + // 2) the time_range control is present (this is the case for legacy charts) + // 3) there was a time filter in adhoc filters if ( !hasGenericChartAxes || + state?.controls?.time_range?.value || ensureIsArray(control.value).findIndex( (flt: any) => flt?.operator === 'TEMPORAL_RANGE', ) > -1 diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx index 1084264789..851958f2fd 100644 --- a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx +++ b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx @@ -494,7 +494,7 @@ export const ControlPanelsContainer = (props: ControlPanelsContainerProps) => { ) => { const isTemporalRange = (filter: Record<string, any>) => filter.operator === Operators.TEMPORAL_RANGE; - if (isTemporalRange(valueToBeDeleted)) { + if (!controls?.time_range?.value && isTemporalRange(valueToBeDeleted)) { const count = values.filter(isTemporalRange).length; if (count === 1) { return t(
