Skip to content
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.

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

FIX: Cancel filter menu item was visible when no filter was filled #2260

Merged
merged 1 commit into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend-html/src/gui/connections/FilterDropDown.tsx
Expand Up @@ -95,7 +95,8 @@ export class FilterDropDown extends React.Component<{ ctx: any }> {
<DropdownItem
isDisabled={
this.filterManager.filtersHidden ||
this.filterManager.isSelectedFilterGroupDefault}
this.filterManager.isSelectedFilterGroupDefault ||
this.filterManager.noFilterActive}
onClick={(event: any) => {
setDropped(false);
runInFlowWithHandler({
Expand Down
2 changes: 1 addition & 1 deletion frontend-html/src/model/entities/FilterGroupManager.ts
Expand Up @@ -71,7 +71,7 @@ export class FilterGroupManager {
}

get noFilterActive() {
return this.selectedFilterGroup?.selectionCheckboxFilter === null &&
return !this.selectedFilterGroup?.selectionCheckboxFilter &&
(
this.activeFilters.length === 0 ||
this.activeFilters.every(filter => !filter.setting.isComplete)
Expand Down