evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add filter options to entity and device selectors (#87536)

Browse source 
* Add support for multiple device classes

* Add support for entity filter selector

* Add support for device filter selector

* Apply suggestions

* Fix wrong property name

* Update snapshot

---------

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
This commit is contained in:
Paul Bottein 2023-02-27 16:38:18 +01:00 • committed by GitHub
parent ac70612ec5
commit e95944bf9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 170 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

100
tests/helpers/test_selector.py
View file

@ -92,6 +92,17 @@ def _test_selector(
(None,),
),
({"entity": {"device_class": "motion"}}, ("abc123",), (None,)),
({"entity": {"device_class": ["motion", "temperature"]}}, ("abc123",), (None,)),
(
{
"entity": [
{"domain": "light"},
{"domain": "binary_sensor", "device_class": "motion"},
]
},
("abc123",),
(None,),
),
(
{
"integration": "zha",
@ -107,6 +118,35 @@ def _test_selector(
(["abc123", "def456"],),
("abc123", None, ["abc123", None]),
),
(
{
"filter": {
"integration": "zha",
"manufacturer": "mock-manuf",
"model": "mock-model",
}
},
("abc123",),
(None,),
),
(
{
"filter": [
{
"integration": "zha",
"manufacturer": "mock-manuf",
"model": "mock-model",
},
{
"integration": "matter",
"manufacturer": "other-mock-manuf",
"model": "other-mock-model",
},
]
},
("abc123",),
(None,),
),
),
)
def test_device_selector_schema(schema, valid_selections, invalid_selections) -> None:
@ -126,6 +166,11 @@ def test_device_selector_schema(schema, valid_selections, invalid_selections) ->
(None, "dog.abc123"),
),
({"device_class": "motion"}, ("sensor.abc123", FAKE_UUID), (None, "abc123")),
(
{"device_class": ["motion", "temperature"]},
("sensor.abc123", FAKE_UUID),
(None, "abc123"),
),
(
{"integration": "zha", "domain": "light"},
("light.abc123", FAKE_UUID),
@ -167,6 +212,21 @@ def test_device_selector_schema(schema, valid_selections, invalid_selections) ->
["sensor.abc123", "sensor.ghi789"],
),
),
(
{"filter": {"domain": "light"}},
("light.abc123", FAKE_UUID),
(None,),
),
(
{
"filter": [
{"domain": "light"},
{"domain": "binary_sensor", "device_class": "motion"},
]
},
("light.abc123", "binary_sensor.abc123", FAKE_UUID),
(None,),
),
),
)
def test_entity_selector_schema(schema, valid_selections, invalid_selections) -> None:
@ -196,11 +256,31 @@ def test_entity_selector_schema(schema, valid_selections, invalid_selections) ->
("abc123",),
(None,),
),
(
{
"entity": [
{"domain": "light"},
{"domain": "binary_sensor", "device_class": "motion"},
]
},
("abc123",),
(None,),
),
(
{"device": {"integration": "demo", "model": "mock-model"}},
("abc123",),
(None,),
),
(
{
"device": [
{"integration": "demo", "model": "mock-model"},
{"integration": "other-demo", "model": "other-mock-model"},
]
},
("abc123",),
(None,),
),
(
{
"entity": {"domain": "binary_sensor", "device_class": "motion"},
@ -345,6 +425,16 @@ def test_state_selector_schema(schema, valid_selections, invalid_selections) ->
({"entity": {}}, (), ()),
({"entity": {"domain": "light"}}, (), ()),
({"entity": {"domain": "binary_sensor", "device_class": "motion"}}, (), ()),
(
{
"entity": [
{"domain": "light"},
{"domain": "binary_sensor", "device_class": "motion"},
]
},
(),
(),
),
(
{
"entity": {
@ -357,6 +447,16 @@ def test_state_selector_schema(schema, valid_selections, invalid_selections) ->
(),
),
({"device": {"integration": "demo", "model": "mock-model"}}, (), ()),
(
{
"device": [
{"integration": "demo", "model": "mock-model"},
{"integration": "other-demo", "model": "other-mock-model"},
],
},
(),
(),
),
(
{
"entity": {"domain": "binary_sensor", "device_class": "motion"},