mirror of https://github.com/apache/superset.git
fix: Applying Dashboard Time Range Filters to Overwritten Charts (#25156)
Co-authored-by: Michael S. Molina <70410625+michael-s-molina@users.noreply.github.com>
This commit is contained in:
parent
8b2a408dea
commit
f2523b26fa
|
@ -79,19 +79,15 @@ export const getSlicePayload = (
|
|||
adhocFilters = extractAddHocFiltersFromFormData(formDataFromSlice);
|
||||
}
|
||||
|
||||
if (
|
||||
isEmpty(adhocFilters?.adhoc_filters) &&
|
||||
isEmpty(formDataFromSlice) &&
|
||||
formDataWithNativeFilters?.adhoc_filters?.[0]?.operator ===
|
||||
Operators.TEMPORAL_RANGE
|
||||
) {
|
||||
adhocFilters.adhoc_filters = [
|
||||
{
|
||||
...formDataWithNativeFilters.adhoc_filters[0],
|
||||
comparator: 'No filter',
|
||||
},
|
||||
];
|
||||
}
|
||||
// This loop iterates through the adhoc_filters array in formDataWithNativeFilters.
|
||||
// If a filter is of type TEMPORAL_RANGE and isExtra, it sets its comparator to
|
||||
// 'No filter' and adds the modified filter to the adhocFilters array. This ensures that all
|
||||
// TEMPORAL_RANGE filters are converted to 'No filter' when saving a chart.
|
||||
formDataWithNativeFilters?.adhoc_filters?.forEach(filter => {
|
||||
if (filter.operator === Operators.TEMPORAL_RANGE && filter.isExtra) {
|
||||
adhocFilters.adhoc_filters.push({ ...filter, comparator: 'No filter' });
|
||||
}
|
||||
});
|
||||
|
||||
const formData = {
|
||||
...formDataWithNativeFilters,
|
||||
|
|
|
@ -302,7 +302,19 @@ describe('getSlicePayload', () => {
|
|||
formDataWithNativeFilters,
|
||||
dashboards,
|
||||
owners,
|
||||
formDataFromSlice,
|
||||
{
|
||||
datasource: '22__table',
|
||||
viz_type: 'pie',
|
||||
adhoc_filters: [
|
||||
{
|
||||
clause: 'WHERE',
|
||||
subject: 'year',
|
||||
operator: 'TEMPORAL_RANGE',
|
||||
comparator: 'No filter',
|
||||
expressionType: 'SIMPLE',
|
||||
},
|
||||
],
|
||||
},
|
||||
);
|
||||
expect(result).toHaveProperty('params');
|
||||
expect(result).toHaveProperty('slice_name', sliceName);
|
||||
|
@ -366,7 +378,6 @@ describe('getSlicePayload', () => {
|
|||
operator: 'TEMPORAL_RANGE',
|
||||
comparator: 'No filter',
|
||||
expressionType: 'SIMPLE',
|
||||
isExtra: true,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue