Skip to content

fix(SelectFilterPlugin): clear all clears all filters including dependent ones #35303

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.

Sign up for GitHub

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

Merged
geido merged 5 commits into from
Nov 6, 2025
Merged

fix(SelectFilterPlugin): clear all clears all filters including dependent ones #35303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d04b915
fix(SelectFilterPlugin): clear all clears all filters
msyavuz Sep 26, 2025
b33cb32
Merge branch 'master' into msyavuz/fix/required-filters-clear-all
msyavuz Oct 27, 2025
74d9820
Merge branch 'master' into msyavuz/fix/required-filters-clear-all
msyavuz Nov 5, 2025
27bb551
fix: ci
msyavuz Nov 5, 2025
83d066a
fix: format
msyavuz Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,9 @@ const FilterBar: FC<FiltersBarProps> = ({

const handleClearAll = useCallback(() => {
const newClearAllTriggers = { ...clearAllTriggers };
filtersInScope.filter(isNativeFilter).forEach(filter => {
// Clear all native filters, not just those in scope
// This ensures dependent filters are cleared even if parent was cleared first
nativeFilterValues.forEach(filter => {
const { id } = filter;
if (dataMaskSelected[id]) {
setDataMaskSelected(draft => {
Expand Down Expand Up @@ -448,10 +450,11 @@ const FilterBar: FC<FiltersBarProps> = ({
setClearAllTriggers(newClearAllTriggers);
}, [
dataMaskSelected,
nativeFilterValues,
setDataMaskSelected,
clearAllTriggers,
dataMaskApplied,
filtersInScope,
chartCustomizationItems,
clearAllTriggers,
dispatch,
]);

Expand Down
28 changes: 18 additions & 10 deletions superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,17 +349,21 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
}

// Handle the default to first Value case
if (defaultToFirstItem) {
// Set to first item if defaultToFirstItem is true
const firstItem: SelectValue = data[0]
? (groupby.map(col => data[0][col]) as string[])
: null;
if (firstItem?.[0] !== undefined) {
updateDataMask(firstItem);
// Skip default values when clearAllTrigger is active to prevent
// defaults from being applied during Clear All operation
if (!clearAllTrigger) {

@geido geido Sep 29, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be useful to add/enhance tests

if (defaultToFirstItem) {
// Set to first item if defaultToFirstItem is true
const firstItem: SelectValue = data[0]
? (groupby.map(col => data[0][col]) as string[])
: null;
if (firstItem?.[0] !== undefined) {
updateDataMask(firstItem);
}
} else if (formData?.defaultValue) {
// Handle defalut value case
updateDataMask(formData.defaultValue);
}
} else if (formData?.defaultValue) {
// Handle defalut value case
updateDataMask(formData.defaultValue);
}
}, [
isDisabled,
Expand All @@ -370,6 +374,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
groupby,
col,
inverseSelection,
clearAllTrigger,
]);

useEffect(() => {
Expand Down Expand Up @@ -406,7 +411,9 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
? (groupby.map(col => data[0][col]) as string[])
: null;

// Skip default value update when clearAllTrigger is active
if (
!clearAllTrigger &&
defaultToFirstItem &&
Object.keys(formData?.extraFormData || {}).length &&
filterState.value !== undefined &&
Expand All @@ -423,6 +430,7 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
formData,
data,
JSON.stringify(filterState.value),
clearAllTrigger,
]);

useEffect(() => {
Expand Down
Loading