Skip to content

fix: Changing "Relative dates" option of saved filter does not enable save button #2947

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
merged 1 commit into from
Jul 27, 2025
Merged

fix: Changing "Relative dates" option of saved filter does not enable save button #2947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/components/BrowserFilter/BrowserFilter.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export default class BrowserFilter extends React.Component {
originalFilterName: '',
confirmDelete: false,
originalFilters: new List(), // Track original filters when entering edit mode
originalRelativeDates: false, // Track original relative dates setting when entering edit mode
};
this.toggle = this.toggle.bind(this);
this.wrapRef = React.createRef();
Expand Down Expand Up @@ -223,6 +224,7 @@ export default class BrowserFilter extends React.Component {
relativeDates: currentFilter.hasRelativeDates,
filters: filtersToUse,
originalFilters: originalFiltersToStore,
originalRelativeDates: currentFilter.hasRelativeDates, // Track original relative dates setting
};
});
}
Expand Down Expand Up @@ -284,6 +286,11 @@ export default class BrowserFilter extends React.Component {
return false;
}

// Check if relative dates setting has changed
if (this.state.relativeDates !== this.state.originalRelativeDates) {
return true;
}

// Compare current state filters with the original filters stored when entering edit mode
const currentFilters = this.normalizeFiltersForComparison(this.state.filters);
const originalFilters = this.normalizeFiltersForComparison(this.state.originalFilters);
Expand Down Expand Up @@ -447,6 +454,7 @@ export default class BrowserFilter extends React.Component {
editMode: this.props.filters.size === 0,
relativeDates: false, // Reset relative dates state when opening/closing
showMore: false, // Reset showMore state when opening/closing
originalRelativeDates: false, // Reset original relative dates state when opening/closing
}));
this.props.setCurrent(null);
}
Expand Down Expand Up @@ -564,6 +572,8 @@ export default class BrowserFilter extends React.Component {
this.setState({
originalFilterName: this.state.name,
filters: uiFilters, // Ensure UI stays with JavaScript Date objects
originalFilters: uiFilters, // Update original filters to reflect the saved state
originalRelativeDates: this.state.relativeDates, // Update original relative dates to reflect the saved state
});
}
}
Expand Down
Loading