jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent removal of complete bridge when removing a device from Matter (#121987)

Browse Source 
* Prevent removal of complete bridge when removing a device from Matter

Currently, when a device is removed from Matter, the complete bridge is
being removed. This might not be the user intention. Bridged devices
themselves can't be deleted really, as they are still part of the
bridge.

Ideally, this should be fixed in the UI (remove the Delete button in
this case). But as a workaround, we can prevent the removal of the
complete bridge by disallowing to remove the bridged device itself.

This also improves deleting when the bridge is already removed from
the Server through some other means: In this case, we delete all devices
at once.

* Update homeassistant/components/matter/__init__.py

---------

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
This commit is contained in:
Stefan Agner 2024-07-16 09:19:55 +01:00 committed by GitHub
parent 2f0870a063
commit 234870538d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
homeassistant/components/matter/__init__.py
View File

@ -3,7 +3,6 @@
from __future__ import annotations
import asyncio
from contextlib import suppress
from functools import cache
from matter_server.client import MatterClient
@ -226,6 +225,20 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
LOGGER.error(err)
def _remove_via_devices(
hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
) -> None:
"""Remove all via devices associated with a device."""
device_registry = dr.async_get(hass)
devices = dr.async_entries_for_config_entry(device_registry, config_entry.entry_id)
for device in devices:
if device.via_device_id == device_entry.id:
LOGGER.info("Removing device %s", device.id)
device_registry.async_update_device(
device.id, remove_config_entry_id=config_entry.entry_id
)
async def async_remove_config_entry_device(
hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
) -> bool:
@ -233,23 +246,25 @@ async def async_remove_config_entry_device(
node = get_node_from_device_entry(hass, device_entry)
if node is None:
# In case this was a bridge
_remove_via_devices(hass, config_entry, device_entry)
# Always allow users to remove orphan devices
return True
if node.is_bridge_device:
device_registry = dr.async_get(hass)
devices = dr.async_entries_for_config_entry(
device_registry, config_entry.entry_id
)
for device in devices:
if device.via_device_id == device_entry.id:
device_registry.async_update_device(
device.id, remove_config_entry_id=config_entry.entry_id
)
if device_entry.via_device_id:
# Do not allow to delete devices that exposed via bridge.
return False
matter = get_matter(hass)
with suppress(NodeNotExists):
# ignore if the server has already removed the node.
try:
await matter.matter_client.remove_node(node.node_id)
except NodeNotExists:
# Ignore if the server has already removed the node.
LOGGER.debug("Node %s didn't exist on the Matter server", node.node_id)
finally:
# Make sure potentially orphan devices of a bridge are removed too.
if node.is_bridge_device:
_remove_via_devices(hass, config_entry, device_entry)
return True