jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-08 13:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure all default MQTT subentry option values are saved (#144347)

Browse Source 
* Ensure all default MQTT subentry option values are saved

* Apply correct filter
This commit is contained in:
Jan Bouwhuis 2025-05-06 19:30:48 +02:00 committed by Franck Nijhof
parent ccffe19611
commit de63dddc96
No known key found for this signature in database
GPG Key ID: AB33ADACE7101952
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/mqtt/config_flow.py
View File

@ -1385,8 +1385,11 @@ def subentry_schema_default_data_from_fields(
return { return {
key: field.default key: field.default
for key, field in data_schema_fields.items() for key, field in data_schema_fields.items()
if field.is_schema_default if _check_conditions(field, component_data)
and (
field.is_schema_default
or (field.default is not vol.UNDEFINED and key not in component_data) or (field.default is not vol.UNDEFINED and key not in component_data)
)
} }
@ -2212,7 +2215,10 @@ class MQTTSubentryFlowHandler(ConfigSubentryFlow):
for component_data in self._subentry_data["components"].values(): for component_data in self._subentry_data["components"].values():
platform = component_data[CONF_PLATFORM] platform = component_data[CONF_PLATFORM]
subentry_default_data = subentry_schema_default_data_from_fields( subentry_default_data = subentry_schema_default_data_from_fields(
PLATFORM_ENTITY_FIELDS[platform] | COMMON_ENTITY_FIELDS, component_data COMMON_ENTITY_FIELDS
| PLATFORM_ENTITY_FIELDS[platform]
| PLATFORM_MQTT_FIELDS[platform],
component_data,
) )
component_data.update(subentry_default_data) component_data.update(subentry_default_data)

4
tests/components/mqtt/common.py
View File

@ -153,6 +153,10 @@ MOCK_SUBENTRY_LIGHT_BASIC_KELVIN_COMPONENT = {
"state_topic": "test-topic", "state_topic": "test-topic",
"color_temp_kelvin": True, "color_temp_kelvin": True,
"state_value_template": "{{ value_json.value }}", "state_value_template": "{{ value_json.value }}",
"brightness_scale": 255,
"max_kelvin": 6535,
"min_kelvin": 2000,
"white_scale": 255,
"entity_picture": "https://example.com/8131babc5e8d4f44b82e0761d39091a2", "entity_picture": "https://example.com/8131babc5e8d4f44b82e0761d39091a2",
}, },
} }