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

Add WebSocket support for assigning labels to entities (#113757)

Browse Source
This commit is contained in:
Franck Nijhof 2024-03-18 22:03:37 +01:00 committed by GitHub
parent 51b8ffc69d
commit e20cc4f8b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/config/entity_registry.py
View File

@ -165,6 +165,7 @@ def websocket_get_entities(
vol.Optional("categories"): cv.schema_with_slug_keys(vol.Any(str, None)), vol.Optional("categories"): cv.schema_with_slug_keys(vol.Any(str, None)),
vol.Optional("device_class"): vol.Any(str, None), vol.Optional("device_class"): vol.Any(str, None),
vol.Optional("icon"): vol.Any(str, None), vol.Optional("icon"): vol.Any(str, None),
vol.Optional("labels"): [str],
vol.Optional("name"): vol.Any(str, None), vol.Optional("name"): vol.Any(str, None),
vol.Optional("new_entity_id"): str, vol.Optional("new_entity_id"): str,
# We only allow setting disabled_by user via API. # We only allow setting disabled_by user via API.
@ -224,6 +225,10 @@ def websocket_update_entity(
# Convert aliases to a set # Convert aliases to a set
changes["aliases"] = set(msg["aliases"]) changes["aliases"] = set(msg["aliases"])
if "labels" in msg:
# Convert labels to a set
changes["labels"] = set(msg["labels"])
if "disabled_by" in msg and msg["disabled_by"] is None: if "disabled_by" in msg and msg["disabled_by"] is None:
# Don't allow enabling an entity of a disabled device # Don't allow enabling an entity of a disabled device
if entity_entry.device_id: if entity_entry.device_id:

13
tests/components/config/test_entity_registry.py
View File

@ -532,6 +532,7 @@ async def test_update_entity(
"device_class": "custom_device_class", "device_class": "custom_device_class",
"hidden_by": "user", # We exchange strings over the WS API, not enums "hidden_by": "user", # We exchange strings over the WS API, not enums
"icon": "icon:after update", "icon": "icon:after update",
"labels": ["label1", "label2"],
"name": "after update", "name": "after update",
} }
) )
@ -554,7 +555,7 @@ async def test_update_entity(
"hidden_by": "user", # We exchange strings over the WS API, not enums "hidden_by": "user", # We exchange strings over the WS API, not enums
"icon": "icon:after update", "icon": "icon:after update",
"id": ANY, "id": ANY,
"labels": [], "labels": unordered(["label1", "label2"]),
"name": "after update", "name": "after update",
"options": {}, "options": {},
"original_device_class": None, "original_device_class": None,
@ -628,7 +629,7 @@ async def test_update_entity(
"hidden_by": "user", # We exchange strings over the WS API, not enums "hidden_by": "user", # We exchange strings over the WS API, not enums
"icon": "icon:after update", "icon": "icon:after update",
"id": ANY, "id": ANY,
"labels": [], "labels": unordered(["label1", "label2"]),
"name": "after update", "name": "after update",
"options": {}, "options": {},
"original_device_class": None, "original_device_class": None,
@ -669,7 +670,7 @@ async def test_update_entity(
"hidden_by": "user", # We exchange strings over the WS API, not enums "hidden_by": "user", # We exchange strings over the WS API, not enums
"icon": "icon:after update", "icon": "icon:after update",
"id": ANY, "id": ANY,
"labels": [], "labels": unordered(["label1", "label2"]),
"name": "after update", "name": "after update",
"options": {"sensor": {"unit_of_measurement": "beard_second"}}, "options": {"sensor": {"unit_of_measurement": "beard_second"}},
"original_device_class": None, "original_device_class": None,
@ -709,7 +710,7 @@ async def test_update_entity(
"hidden_by": "user", # We exchange strings over the WS API, not enums "hidden_by": "user", # We exchange strings over the WS API, not enums
"icon": "icon:after update", "icon": "icon:after update",
"id": ANY, "id": ANY,
"labels": [], "labels": unordered(["label1", "label2"]),
"name": "after update", "name": "after update",
"options": {"sensor": {"unit_of_measurement": "beard_second"}}, "options": {"sensor": {"unit_of_measurement": "beard_second"}},
"original_device_class": None, "original_device_class": None,
@ -749,7 +750,7 @@ async def test_update_entity(
"hidden_by": "user", # We exchange strings over the WS API, not enums "hidden_by": "user", # We exchange strings over the WS API, not enums
"icon": "icon:after update", "icon": "icon:after update",
"id": ANY, "id": ANY,
"labels": [], "labels": unordered(["label1", "label2"]),
"name": "after update", "name": "after update",
"options": {"sensor": {"unit_of_measurement": "beard_second"}}, "options": {"sensor": {"unit_of_measurement": "beard_second"}},
"original_device_class": None, "original_device_class": None,
@ -789,7 +790,7 @@ async def test_update_entity(
"hidden_by": "user", # We exchange strings over the WS API, not enums "hidden_by": "user", # We exchange strings over the WS API, not enums
"icon": "icon:after update", "icon": "icon:after update",
"id": ANY, "id": ANY,
"labels": [], "labels": unordered(["label1", "label2"]),
"name": "after update", "name": "after update",
"options": {"sensor": {"unit_of_measurement": "beard_second"}}, "options": {"sensor": {"unit_of_measurement": "beard_second"}},
"original_device_class": None, "original_device_class": None,