Merge pull request #77 from Monitor-My-Solar/monitormysolarDEV

Monitormysolar dev

Author: zakery292

custom_components/monitormysolar/entity.py

@@ -13,8 +13,6 @@
 class MonitorMySolarEntity(CoordinatorEntity[MonitorMySolar]):
     """Base MonitorMySolar entity."""
 
-    _attr_has_entity_name = True
-
     def __init__(
         self,
         coordinator: MonitorMySolar,
@@ -23,6 +21,11 @@ def __init__(
         """Initialize light."""
         super().__init__(coordinator)
 
+        # Dynamically set has_entity_name based on number of dongles
+        # If single dongle, don't use entity name (cleaner display)
+        # If multiple dongles, use entity name for clarity
+        self._attr_has_entity_name = len(coordinator._dongle_ids) > 1
+        
         # If this attribute is not set in a subclass, default to True
         if not hasattr(self, '_attr_entity_registry_enabled_default'):
             self._attr_entity_registry_enabled_default = True
@@ -75,7 +78,7 @@ def get_device_info(self, dongle_id: str, manufacturer: str) -> dict:
         # Note: Home Assistant expects exactly these field names
         device_info = {
             "identifiers": {(DOMAIN, dongle_id)},
-            "name": f"{dongle_id}",
+            "name": dongle_id,
         }
 
         # Default model and manufacturer values

custom_components/monitormysolar/manifest.json

@@ -10,6 +10,6 @@
   "issue_tracker": "https://github.com/Monitor-My-Solar/monitormysolar",
   "loggers": [],
   "requirements": [],    
-  "version": "3.0.1"
+  "version": "3.0.3"
 }
 

custom_components/monitormysolar/sensor.py

@@ -141,9 +141,13 @@ def __init__(self, sensor_info, hass, entry, bank_name, dongle_id):
     @property
     def name(self):
         """Return the name of the sensor."""
-        # When has_entity_name is True, just return the entity name
-        # Home Assistant will combine it with the device name
-        return self._name
+        # If single dongle (has_entity_name is False), return just the name
+        # If multiple dongles (has_entity_name is True), return entity name only
+        if self._attr_has_entity_name:
+            return self._name
+        else:
+            # For single dongle, return a clean name without device prefix
+            return self._name
 
     @property
     def unique_id(self):
@@ -275,9 +279,13 @@ def __init__(self, sensor_info, hass, entry, bank_name, dongle_id):
     @property
     def name(self):
         """Return the name of the sensor."""
-        # When has_entity_name is True, just return the entity name
-        # Home Assistant will combine it with the device name
-        return self._name
+        # If single dongle (has_entity_name is False), return just the name
+        # If multiple dongles (has_entity_name is True), return entity name only
+        if self._attr_has_entity_name:
+            return self._name
+        else:
+            # For single dongle, return a clean name without device prefix
+            return self._name
 
     @property
     def unique_id(self):
@@ -348,9 +356,13 @@ def __init__(self, sensor_info, hass, entry, bank_name, dongle_id):
     @property
     def name(self):
         """Return the name of the sensor."""
-        # When has_entity_name is True, just return the entity name
-        # Home Assistant will combine it with the device name
-        return self._name
+        # If single dongle (has_entity_name is False), return just the name
+        # If multiple dongles (has_entity_name is True), return entity name only
+        if self._attr_has_entity_name:
+            return self._name
+        else:
+            # For single dongle, return a clean name without device prefix
+            return self._name
 
     @property
     def unique_id(self):
@@ -499,9 +511,13 @@ def __init__(self, sensor_info, hass, entry, bank_name, dongle_id):
     @property
     def name(self):
         """Return the name of the sensor."""
-        # When has_entity_name is True, just return the entity name
-        # Home Assistant will combine it with the device name
-        return self._name
+        # If single dongle (has_entity_name is False), return just the name
+        # If multiple dongles (has_entity_name is True), return entity name only
+        if self._attr_has_entity_name:
+            return self._name
+        else:
+            # For single dongle, return a clean name without device prefix
+            return self._name
 
     @property
     def unique_id(self):

custom_components/monitormysolar/update.py

@@ -75,7 +75,6 @@ class DongleFirmwareUpdate(MonitorMySolarEntity, UpdateEntity):
 
     _attr_supported_features = UpdateEntityFeature.RELEASE_NOTES | UpdateEntityFeature.INSTALL | UpdateEntityFeature.PROGRESS
     _attr_device_class = UpdateDeviceClass.FIRMWARE
-    _attr_has_entity_name = True
 
     def __init__(
         self,
@@ -105,7 +104,12 @@ def device_info(self):
     @property
     def name(self):
         """Return the name of the entity."""
-        return f"{self._dongle_id} Firmware"
+        if self._attr_has_entity_name:
+            # Multiple dongles - return just "Firmware"
+            return "Firmware"
+        else:
+            # Single dongle - return full name
+            return "Firmware Update"
 
     @property
     def unique_id(self):