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.

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

Jump to bottom

Ensure multiselect Tabulator header filter uses 'in' filter function #7111

Merged
merged 3 commits into from
Aug 13, 2024
Merged

Ensure multiselect Tabulator header filter uses 'in' filter function #7111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8f2de5
Ensure multiselect Tabulator header filter uses 'in' filter function
philippjfr Aug 9, 2024
9c498c5
Merge branch 'main' into multi_select_filter_tabulator
philippjfr Aug 13, 2024
89888ed
Update tests
philippjfr Aug 13, 2024
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
6 changes: 3 additions & 3 deletions panel/tests/widgets/test_tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ def test_tabulator_header_filters_column_config_list(document, comm):
{'field': 'index', 'sorter': 'number'},
{'field': 'A', 'sorter': 'number'},
{'field': 'B', 'sorter': 'number'},
{'field': 'C', 'headerFilter': 'list', 'headerFilterParams': {'valuesLookup': True}},
{'field': 'C', 'headerFilter': 'list', 'headerFilterParams': {'valuesLookup': True}, 'headerFilterFunc': 'in'},
{'field': 'D', 'sorter': 'timestamp'}
]
assert model.configuration['selectable'] == True
Expand All @@ -682,8 +682,8 @@ def test_tabulator_header_filters_column_config_select_autocomplete_backwards_co
{'field': 'index', 'sorter': 'number'},
{'field': 'A', 'sorter': 'number'},
{'field': 'B', 'sorter': 'number'},
{'field': 'C', 'headerFilter': 'list', 'headerFilterParams': {'valuesLookup': True}},
{'field': 'D', 'headerFilter': 'list', 'headerFilterParams': {'valuesLookup': True}, 'sorter': 'timestamp'},
{'field': 'C', 'headerFilter': 'list', 'headerFilterParams': {'valuesLookup': True}, 'headerFilterFunc': 'in'},
{'field': 'D', 'headerFilter': 'list', 'headerFilterParams': {'valuesLookup': True}, 'sorter': 'timestamp', 'headerFilterFunc': 'in'},
]
assert model.configuration['selectable'] == True

Expand Down
7 changes: 5 additions & 2 deletions panel/widgets/tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,8 +1851,11 @@ def _get_filter_spec(self, column: TableColumn) -> dict[str, Any]:
)
del filter_params['values']
filter_params['valuesLookup'] = True
if filter_type == 'list' and not filter_params:
filter_params = {'valuesLookup': True}
if filter_type == 'list':
if not filter_params:
filter_params = {'valuesLookup': True}
if filter_func is None:
filter_func = 'in'
fspec['headerFilter'] = filter_type
if filter_params:
fspec['headerFilterParams'] = filter_params
Expand Down
Loading