pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Lily Kuang 2023-09-01 14:30:37 -07:00 committed by GitHub
parent 8b2a408dea
commit f2523b26fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
superset-frontend/src/explore/actions/saveModalActions.js
View File

@ -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,

15
superset-frontend/src/explore/actions/saveModalActions.test.js
View File

@ -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,
},
],
};