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

Fix registered entities without a category not being exclude-able in the HomeKit UI (#69543)

Browse source
This commit is contained in:
J. Nick Koston 2022-04-07 01:46:41 -10:00 • committed by GitHub
parent a5dc95e715
commit 47c3aef7a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/homekit/config_flow.py
View file

@ -652,7 +652,7 @@ def _exclude_by_entity_registry(
(entry := ent_reg.async_get(entity_id)) (entry := ent_reg.async_get(entity_id))
and ( and (
entry.hidden_by is not None entry.hidden_by is not None
or (not include_entity_category or entry.entity_category is not None) or (not include_entity_category and entry.entity_category is not None)
) )
) )

24
tests/components/homekit/test_config_flow.py
View file

@ -1347,6 +1347,16 @@ async def test_options_flow_exclude_mode_skips_category_entities(
entity_category=EntityCategory.CONFIG, entity_category=EntityCategory.CONFIG,
) )
hass.states.async_set(sonos_config_switch.entity_id, "off") hass.states.async_set(sonos_config_switch.entity_id, "off")
sonos_notconfig_switch: RegistryEntry = entity_reg.async_get_or_create(
"switch",
"sonos",
"notconfig",
device_id="1234",
entity_category=None,
)
hass.states.async_set(sonos_notconfig_switch.entity_id, "off")
await hass.async_block_till_done() await hass.async_block_till_done()
result = await hass.config_entries.options.async_init( result = await hass.config_entries.options.async_init(
@ -1391,14 +1401,24 @@ async def test_options_flow_exclude_mode_skips_category_entities(
result4 = await hass.config_entries.options.async_configure( result4 = await hass.config_entries.options.async_configure(
result2["flow_id"], result2["flow_id"],
user_input={"entities": ["media_player.tv", "switch.other"]}, user_input={
"entities": [
"media_player.tv",
"switch.other",
sonos_notconfig_switch.entity_id,
]
},
) )
assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
assert config_entry.options == { assert config_entry.options == {
"mode": "bridge", "mode": "bridge",
"filter": { "filter": {
"exclude_domains": [], "exclude_domains": [],
"exclude_entities": ["media_player.tv", "switch.other"], "exclude_entities": [
"media_player.tv",
"switch.other",
sonos_notconfig_switch.entity_id,
],
"include_domains": ["media_player", "switch"], "include_domains": ["media_player", "switch"],
"include_entities": [], "include_entities": [],
}, },