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

Adjust zha routine to get name and original_name (#73646)

Browse Source
This commit is contained in:
epenet 2022-06-19 21:38:01 +02:00 committed by GitHub
parent e53372f559
commit e7e9c65e44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
homeassistant/components/zha/api.py
View File

@ -60,6 +60,7 @@ from .core.const import (
ZHA_CHANNEL_MSG, ZHA_CHANNEL_MSG,
ZHA_CONFIG_SCHEMAS, ZHA_CONFIG_SCHEMAS,
) )
from .core.gateway import EntityReference
from .core.group import GroupMember from .core.group import GroupMember
from .core.helpers import ( from .core.helpers import (
async_cluster_exists, async_cluster_exists,
@ -316,6 +317,22 @@ async def websocket_get_devices(
connection.send_result(msg[ID], devices) connection.send_result(msg[ID], devices)
@callback
def _get_entity_name(
zha_gateway: ZHAGateway, entity_ref: EntityReference
) -> str | None:
entry = zha_gateway.ha_entity_registry.async_get(entity_ref.reference_id)
return entry.name if entry else None
@callback
def _get_entity_original_name(
zha_gateway: ZHAGateway, entity_ref: EntityReference
) -> str | None:
entry = zha_gateway.ha_entity_registry.async_get(entity_ref.reference_id)
return entry.original_name if entry else None
@websocket_api.require_admin @websocket_api.require_admin
@websocket_api.websocket_command({vol.Required(TYPE): "zha/devices/groupable"}) @websocket_api.websocket_command({vol.Required(TYPE): "zha/devices/groupable"})
@websocket_api.async_response @websocket_api.async_response
@ -336,12 +353,10 @@ async def websocket_get_groupable_devices(
"endpoint_id": ep_id, "endpoint_id": ep_id,
"entities": [ "entities": [
{ {
"name": zha_gateway.ha_entity_registry.async_get( "name": _get_entity_name(zha_gateway, entity_ref),
entity_ref.reference_id "original_name": _get_entity_original_name(
).name, zha_gateway, entity_ref
"original_name": zha_gateway.ha_entity_registry.async_get( ),
entity_ref.reference_id
).original_name,
} }
for entity_ref in entity_refs for entity_ref in entity_refs
if list(entity_ref.cluster_channels.values())[ if list(entity_ref.cluster_channels.values())[