Fix entities are not unhidden when forced hidden by user (#1269)

bramstroker · Nov 13, 2022 · 9ab2901 · 9ab2901
1 parent 11ab77c
commit 9ab2901
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/custom_components/powercalc/sensors/group.py b/custom_components/powercalc/sensors/group.py
@@ -390,6 +390,10 @@ def _async_hide_members(self, hide: True) -> None:
             if not registry_entry:
                 continue
 
+            # We don't want to touch devices which are forced hidden by the user
+            if registry_entry.hidden_by == er.RegistryEntryHider.USER:
+                continue
+
             hidden_by = er.RegistryEntryHider.INTEGRATION if hide else None
             registry.async_update_entity(entity_id, hidden_by=hidden_by)
 

diff --git a/tests/sensors/test_group.py b/tests/sensors/test_group.py
@@ -394,6 +394,34 @@ async def test_unhide_members(hass: HomeAssistant):
     assert entity_reg.async_get("sensor.test_power").hidden_by is None
 
 
+async def test_user_hidden_entities_remain_hidden(hass: HomeAssistant) -> None:
+    entity_reg = er.async_get(hass)
+    entity_reg.async_get_or_create(
+        SENSOR_DOMAIN,
+        DOMAIN,
+        "abcdef",
+        suggested_object_id="test_power",
+        hidden_by=er.RegistryEntryHider.USER,
+    )
+    await hass.async_block_till_done()
+
+    await run_powercalc_setup_yaml_config(
+        hass,
+        {
+            CONF_CREATE_GROUP: "TestGroup",
+            CONF_HIDE_MEMBERS: False,
+            CONF_ENTITIES: [
+                {
+                    CONF_ENTITY_ID: DUMMY_ENTITY_ID,
+                    CONF_POWER_SENSOR_ID: "sensor.test_power",
+                },
+            ],
+        },
+    )
+
+    assert entity_reg.async_get("sensor.test_power").hidden_by is er.RegistryEntryHider.USER
+
+
 async def test_members_are_unhiden_after_group_removed(
     hass: HomeAssistant, entity_reg: EntityRegistry
 ):