Migrate geniushub to has entity name

homeassistant/components/geniushub/binary_sensor.py

@@ -32,17 +32,14 @@ async def async_setup_entry(
 class GeniusBinarySensor(GeniusDevice, BinarySensorEntity):
     """Representation of a Genius Hub binary_sensor."""
 
+    _attr_name = None
+
     def __init__(self, broker, device, state_attr) -> None:
         """Initialize the binary sensor."""
         super().__init__(broker, device)
 
         self._state_attr = state_attr
 
-        if device.type[:21] == "Dual Channel Receiver":
-            self._attr_name = f"{device.type[:21]} {device.id}"
-        else:
-            self._attr_name = f"{device.type} {device.id}"
-
     @property
     def is_on(self) -> bool:
         """Return the status of the sensor."""

homeassistant/components/geniushub/entity.py

@@ -4,6 +4,7 @@
 from typing import Any
 
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 import homeassistant.util.dt as dt_util
@@ -25,6 +26,7 @@
 class GeniusEntity(Entity):
     """Base for all Genius Hub entities."""
 
+    _attr_has_entity_name = True
     _attr_should_poll = False
 
     def __init__(self) -> None:
@@ -56,6 +58,16 @@
         self._unique_id = f"{broker.hub_uid}_device_{device.id}"
         self._last_comms: datetime | None = None
         self._state_attr = None
+        device_name = device.type
+        if device_name[:21] == "Dual Channel Receiver":
+            device_name = "Dual Channel Receiver"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"{broker.hub_uid}_{device.id}")},
+            model=device.type,
+            name=f"{device_name} {device.id}",
+            suggested_area=device.data["assignedZones"][0]["name"],
+            via_device=(DOMAIN, broker.hub_uid),
+        )
 
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
@@ -86,12 +98,20 @@
 class GeniusZone(GeniusEntity):
     """Base for all Genius Hub zones."""
 
+    _attr_name = None
+
     def __init__(self, broker, zone) -> None:
         """Initialize the Zone."""
         super().__init__()
 
         self._zone = zone
         self._unique_id = f"{broker.hub_uid}_zone_{zone.id}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"{broker.hub_uid}_{zone.id}")},
+            name=zone.name,
+            suggested_area=zone.name,
+            via_device=(DOMAIN, broker.hub_uid),
+        )
 
     async def _refresh(self, payload: dict | None = None) -> None:
         """Process any signals."""
@@ -118,11 +138,6 @@
 
         await self._zone.set_mode(mode)
 
-    @property
-    def name(self) -> str:
-        """Return the name of the climate device."""
-        return self._zone.name
-
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the device state attributes."""

homeassistant/components/geniushub/sensor.py

@@ -8,10 +8,11 @@
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 import homeassistant.util.dt as dt_util
 
-from . import GeniusHubConfigEntry
+from . import DOMAIN, GeniusHubConfigEntry
 from .entity import GeniusDevice, GeniusEntity
 
 GH_STATE_ATTR = "batteryLevel"
@@ -54,8 +55,6 @@ def __init__(self, broker, device, state_attr) -> None:
 
         self._state_attr = state_attr
 
-        self._attr_name = f"{device.type} {device.id}"
-
     @property
     def icon(self) -> str:
         """Return the icon of the sensor."""
@@ -98,9 +97,13 @@ def __init__(self, broker, level) -> None:
         self._hub = broker.client
         self._unique_id = f"{broker.hub_uid}_{GH_LEVEL_MAPPING[level]}"
 
-        self._attr_name = f"GeniusHub {GH_LEVEL_MAPPING[level]}"
+        self._attr_translation_key = level
         self._level = level
         self._issues: list = []
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, broker.hub_uid)},
+            name="GeniusHub",
+        )
 
     @property
     def native_value(self) -> int:

homeassistant/components/geniushub/strings.json

@@ -33,7 +33,19 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   },
-
+  "entity": {
+    "sensor": {
+      "error": {
+        "name": "Errors"
+      },
+      "warning": {
+        "name": "Warnings"
+      },
+      "information": {
+        "name": "Information"
+      }
+    }
+  },
   "services": {
     "set_zone_mode": {
       "name": "Set zone mode",

tests/components/geniushub/snapshots/test_binary_sensor.ambr

@@ -12,7 +12,7 @@
     'domain': 'binary_sensor',
     'entity_category': None,
     'entity_id': 'binary_sensor.single_channel_receiver_22',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -23,7 +23,7 @@
     }),
     'original_device_class': None,
     'original_icon': None,
-    'original_name': 'Single Channel Receiver 22',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': 0,

tests/components/geniushub/snapshots/test_climate.ambr

@@ -22,7 +22,7 @@
     'domain': 'climate',
     'entity_category': None,
     'entity_id': 'climate.bedroom',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -33,7 +33,7 @@
     }),
     'original_device_class': None,
     'original_icon': 'mdi:radiator',
-    'original_name': 'Bedroom',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
@@ -102,7 +102,7 @@
     'domain': 'climate',
     'entity_category': None,
     'entity_id': 'climate.ensuite',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -113,7 +113,7 @@
     }),
     'original_device_class': None,
     'original_icon': 'mdi:radiator',
-    'original_name': 'Ensuite',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
@@ -184,7 +184,7 @@
     'domain': 'climate',
     'entity_category': None,
     'entity_id': 'climate.guest_room',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -195,7 +195,7 @@
     }),
     'original_device_class': None,
     'original_icon': 'mdi:radiator',
-    'original_name': 'Guest room',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
@@ -266,7 +266,7 @@
     'domain': 'climate',
     'entity_category': None,
     'entity_id': 'climate.hall',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -277,7 +277,7 @@
     }),
     'original_device_class': None,
     'original_icon': 'mdi:radiator',
-    'original_name': 'Hall',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
@@ -348,7 +348,7 @@
     'domain': 'climate',
     'entity_category': None,
     'entity_id': 'climate.kitchen',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -359,7 +359,7 @@
     }),
     'original_device_class': None,
     'original_icon': 'mdi:radiator',
-    'original_name': 'Kitchen',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
@@ -429,7 +429,7 @@
     'domain': 'climate',
     'entity_category': None,
     'entity_id': 'climate.lounge',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -440,7 +440,7 @@
     }),
     'original_device_class': None,
     'original_icon': 'mdi:radiator',
-    'original_name': 'Lounge',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 401>,
@@ -509,7 +509,7 @@
     'domain': 'climate',
     'entity_category': None,
     'entity_id': 'climate.study',
-    'has_entity_name': False,
+    'has_entity_name': True,
     'hidden_by': None,
     'icon': None,
     'id': <ANY>,
@@ -520,7 +520,7 @@
     }),
     'original_device_class': None,
     'original_icon': 'mdi:radiator',
-    'original_name': 'Study',
+    'original_name': None,
     'platform': 'geniushub',
     'previous_unique_id': None,
     'supported_features': <ClimateEntityFeature: 401>,

tests/components/geniushub/snapshots/test_init.ambr

@@ -0,0 +1,65 @@
+# serializer version: 1
+# name: test_device_info
+  DeviceRegistryEntrySnapshot({
+    'area_id': None,
+    'config_entries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'geniushub',
+        '01J71MQF0EC62D620DGYNG2R8H',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'GeniusHub',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': None,
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---
+# name: test_device_info.1
+  DeviceRegistryEntrySnapshot({
+    'area_id': 'study',
+    'config_entries': <ANY>,
+    'configuration_url': None,
+    'connections': set({
+    }),
+    'disabled_by': None,
+    'entry_type': None,
+    'hw_version': None,
+    'id': <ANY>,
+    'identifiers': set({
+      tuple(
+        'geniushub',
+        '01J71MQF0EC62D620DGYNG2R8H_30',
+      ),
+    }),
+    'is_new': False,
+    'labels': set({
+    }),
+    'manufacturer': None,
+    'model': None,
+    'model_id': None,
+    'name': 'Study',
+    'name_by_user': None,
+    'primary_config_entry': <ANY>,
+    'serial_number': None,
+    'suggested_area': 'Study',
+    'sw_version': None,
+    'via_device_id': None,
+  })
+# ---