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

Expose the disabled property of filters #195

Merged
merged 6 commits into from
Oct 11, 2021
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lumen/filters/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ class BaseWidgetFilter(Filter):

default = param.Parameter(doc="""
The default value to use on the widget.""")

disabled = param.Boolean(default=False, doc="""
Whether the filter should be disabled.""")

visible = param.Boolean(default=True, doc="""
Whether the filter should be visible.""")
Expand All @@ -170,7 +173,7 @@ class BaseWidgetFilter(Filter):
@property
def panel(self):
widget = self.widget.clone()
self.widget.link(widget, value='value', visible='visible', bidirectional=True)
self.widget.link(widget, value='value', visible='visible', disabled='disabled', bidirectional=True)
return widget


Expand Down Expand Up @@ -204,7 +207,8 @@ def __init__(self, **params):
self.widget.value = ' '
self.widget.name = self.label
self.widget.visible = self.visible
self.widget.link(self, value='value', visible='visible', bidirectional=True)
self.widget.disabled = self.disabled
self.widget.link(self, value='value', visible='visible', disabled='disabled', bidirectional=True)
if self.default is not None:
self.widget.value = self.default

Expand Down Expand Up @@ -257,7 +261,7 @@ def __init__(self, **params):
else:
value = tuple(self.default)
self.widget = widget(name=self.label, options=options, value=value)
self.widget.link(self, value='value', visible='visible', bidirectional=True)
self.widget.link(self, value='value', visible='visible', disabled='disabled', bidirectional=True)

@property
def query(self):
Expand Down
8 changes: 8 additions & 0 deletions lumen/tests/filters/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,11 @@ def test_widget_filter_link():
wfilter.value = (2, 2)

assert widget.value == (2, 2)

widget.visible = False

assert wfilter.visible == False

widget.disabled = False

assert widget.disabled == False
38 changes: 37 additions & 1 deletion lumen/tests/views/test_base.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
from lumen.views import View
from pathlib import Path

import pandas as pd

from lumen.sources import FileSource
from lumen.views import View, hvPlotView


def test_resolve_module_type():
assert View._get_type('lumen.views.base.View') is View


def test_view_hvplot_basis(set_root):
set_root(str(Path(__file__).parent.parent))
source = FileSource(tables={'test': 'sources/test.csv'})
view = {
'type': 'hvplot',
'table': 'test',
'x': 'A',
'y': 'B',
'kind': 'scatter',
}

view = View.from_spec(view, source, [])

assert isinstance(view, hvPlotView)
assert view.kind == 'scatter'
assert view.source == source
assert view.filters == []
assert view.transforms == []
assert view.controls == []

df = view.get_data()

assert isinstance(df, pd.DataFrame)
assert df.shape == (5, 4)

plot = view.get_plot(df)

assert plot.kdims == ['A']
assert plot.vdims == ['B']
1 change: 1 addition & 0 deletions lumen/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ def get_data(self):
for filt in self.filters:
filt_query = filt.query
if (filt_query is not None and
not getattr(filt, 'disabled', None) and
(filt.table is None or filt.table == self.table)):
query[filt.field] = filt_query
data = self.source.get(self.table, **query)
Expand Down