fix: correctness bugs

Author: bramstroker

custom_components/powercalc/flow_helper/dynamic_field_builder.py

@@ -23,12 +23,21 @@ def build_dynamic_field_schema(
         else:
             key = vol.Required(field.key, description=field_description)
 
+        field_selector = field.selector
         if "entity" in field.selector and source_entity and source_entity.device_entry:
             entity_reg = er.async_get(hass)
-            field.selector["entity"]["include_entities"] = [
-                entity.entity_id
-                for entity in entity_reg.entities.get_entries_for_device_id(source_entity.device_entry.id)
-            ]
+            # Build a new selector dict instead of mutating field.selector, which is a reference
+            # into the (potentially cached) profile json_data.
+            field_selector = {
+                **field.selector,
+                "entity": {
+                    **field.selector["entity"],
+                    "include_entities": [
+                        entity.entity_id
+                        for entity in entity_reg.entities.get_entries_for_device_id(source_entity.device_entry.id)
+                    ],
+                },
+            }
 
-        schema[key] = selector(field.selector)
+        schema[key] = selector(field_selector)
     return vol.Schema(schema)

custom_components/powercalc/sensors/group/config_entry_utils.py

@@ -28,7 +28,9 @@ def remove_power_sensor_from_associated_groups(
     group_entries = get_groups_having_member(hass, config_entry)
 
     for group_entry in group_entries:
-        member_sensors = group_entry.data.get(CONF_GROUP_MEMBER_SENSORS) or []
+        # Copy the list so we don't mutate the config entry's data in place, which would make
+        # async_update_entry's change detection see no change and skip persisting/reloading.
+        member_sensors = list(group_entry.data.get(CONF_GROUP_MEMBER_SENSORS) or [])
         member_sensors.remove(config_entry.entry_id)
 
         hass.config_entries.async_update_entry(