-
-
Notifications
You must be signed in to change notification settings - Fork 28
Add the ability to add filters to exploration #1599
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -22,12 +22,13 @@ | |||||||
| from panel.widgets import CodeEditor | ||||||||
| from panel_gwalker import GraphicWalker | ||||||||
| from panel_material_ui import ( | ||||||||
| Alert, Button, Checkbox, CircularProgress, Column, FileDownload, | ||||||||
| MenuButton, | ||||||||
| Alert, Button, Checkbox, CircularProgress, Column, FileDownload, FlexBox, | ||||||||
| MenuButton, MenuToggle, | ||||||||
| ) | ||||||||
|
|
||||||||
| from ..base import Component | ||||||||
| from ..config import dump_yaml, load_yaml | ||||||||
| from ..filters import WidgetFilter | ||||||||
| from ..pipeline import Pipeline | ||||||||
| from ..transforms.sql import SQLLimit | ||||||||
| from ..views.base import Panel, Table, View | ||||||||
|
|
@@ -489,6 +490,61 @@ def export(self, fmt: str) -> str | bytes: | |||||||
| sio.seek(0) | ||||||||
| return sio | ||||||||
|
|
||||||||
| def _render_editor(self): | ||||||||
| editor = super()._render_editor() | ||||||||
| self._filters = {} | ||||||||
| self._filter_area = FlexBox(width_policy="max") | ||||||||
| editor.insert(0, self._filter_area) | ||||||||
| return editor | ||||||||
|
|
||||||||
| def _add_filter(self, item): | ||||||||
| field = item["label"] | ||||||||
| if item["toggled"]: | ||||||||
| if field in self._filters: | ||||||||
| filt = self._filters[field] | ||||||||
| else: | ||||||||
| self._filters[field] = filt = WidgetFilter(field=field, schema=self.component.schema) | ||||||||
| self._filter_area.append(filt.widget) | ||||||||
| self.component.add_filter(filt) | ||||||||
| return | ||||||||
| removed_filters = [filt for filt in self.component.filters if filt.field == field] | ||||||||
| removed_widgets = [filt.widget for filt in removed_filters] | ||||||||
| self._filter_area[:] = [w for w in self._filter_area if w not in removed_widgets] | ||||||||
| self.component.filters = [filt for filt in self.component.filters if filt not in removed_filters] | ||||||||
|
|
||||||||
| def render_controls(self, task: Task, interface: ChatFeed): | ||||||||
| controls = super().render_controls(task, interface) | ||||||||
| items = [] | ||||||||
| for col in self.component.data.columns: | ||||||||
| if col not in self.component.schema: | ||||||||
|
||||||||
| if col not in self.component.schema: | |
| if col not in self.component.schema: | |
| # Skip columns without schema information (e.g., internal or derived columns) |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2,6 +2,12 @@ | |||||
| import panel as pn | ||||||
| import param # type: ignore | ||||||
|
|
||||||
| from panel_material_ui import ( | ||||||
| Checkbox, DatePicker, DateRangeSlider, DatetimeInput, DatetimePicker, | ||||||
| FloatInput, FloatSlider, IntInput, IntRangeSlider, IntSlider, LiteralInput, | ||||||
| MultiChoice, RangeSlider, Select, TextInput, | ||||||
| ) | ||||||
|
|
||||||
| from .util import resolve_module_reference | ||||||
|
|
||||||
|
|
||||||
|
|
@@ -30,33 +36,33 @@ class JSONSchema(pn.pane.PaneBase): | |||||
|
|
||||||
| _unpack = True | ||||||
|
|
||||||
| _select_widget = pn.widgets.Select | ||||||
| _multi_select_widget = pn.widgets.MultiSelect | ||||||
| _bounded_number_widget = pn.widgets.FloatSlider | ||||||
| _bounded_number_range_widget = pn.widgets.RangeSlider | ||||||
| _unbounded_number_widget = pn.widgets.FloatInput | ||||||
| _list_select_widget = pn.widgets.MultiSelect | ||||||
| _bounded_int_widget = pn.widgets.IntSlider | ||||||
| _bounded_int_range_widget = pn.widgets.IntRangeSlider | ||||||
| _unbounded_int_widget = pn.widgets.IntInput | ||||||
| _string_widget = pn.widgets.TextInput | ||||||
| _boolean_widget = pn.widgets.Checkbox | ||||||
| _literal_widget = pn.widgets.LiteralInput | ||||||
| _unbounded_date_widget = pn.widgets.DatePicker | ||||||
| _date_range_widget = pn.widgets.DateRangeSlider | ||||||
| _select_widget = Select | ||||||
| _multi_select_widget = MultiChoice | ||||||
| _bounded_number_widget = FloatSlider | ||||||
| _bounded_number_range_widget = RangeSlider | ||||||
| _unbounded_number_widget = FloatInput | ||||||
| _list_select_widget = MultiChoice | ||||||
| _bounded_int_widget = IntSlider | ||||||
| _bounded_int_range_widget = IntRangeSlider | ||||||
| _unbounded_int_widget = IntInput | ||||||
| _string_widget = TextInput | ||||||
| _boolean_widget = Checkbox | ||||||
| _literal_widget = LiteralInput | ||||||
| _unbounded_date_widget = DatePicker | ||||||
| _date_range_widget = DateRangeSlider | ||||||
|
|
||||||
| # Not available until Panel 0.11 | ||||||
| try: | ||||||
| _datetime_range_widget = pn.widgets.DatetimeRangeInput | ||||||
| except Exception: | ||||||
| _datetime_range_widget = pn.widgets.DateRangeSlider | ||||||
| _datetime_range_widget = DateRangeSlider | ||||||
|
|
||||||
| # Not available until Panel 0.12 | ||||||
| try: | ||||||
| _unbounded_datetime_widget = pn.widgets.DatetimePicker | ||||||
| _unbounded_datetime_widget = DatetimePicker | ||||||
| _datetime_range_widget = pn.widgets.DatetimeRangePicker | ||||||
| except Exception: | ||||||
| _unbounded_datetime_widget = pn.widgets.DatetimeInput | ||||||
| _unbounded_datetime_widget = DatetimeInput | ||||||
|
|
||||||
| def _array_type(self, schema): | ||||||
| if 'items' in schema and not schema.get('additionalItems', True): | ||||||
|
|
@@ -156,7 +162,7 @@ def _update_widgets_from_schema(self): | |||||
| values = {} if self.object is None else self.object | ||||||
| widgets = [] | ||||||
| for p, schema in self.schema.items(): | ||||||
| if self.properties and p not in self.properties: | ||||||
| if p == '__len__' or self.properties and p not in self.properties: | ||||||
|
||||||
| if p == '__len__' or self.properties and p not in self.properties: | |
| if p == '__len__' or (self.properties and p not in self.properties): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If a filter already exists in
self._filters(line 503-504), it gets re-appended to bothself._filter_areaandself.component.filters(lines 507-508). This could lead to duplicate filters in the UI and the component's filter list. Consider checking if the filter is already active before re-adding it.