Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove "none" in favor of optional select in integration (#101396)

pull/101311/head
Robert Resch 2023-10-11 17:36:53 +02:00 committed by GitHub
parent 7db2fdd68c
commit 1915fee9ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/integration/config_flow.py
View File

@ -27,7 +27,6 @@ from .const import (
)
UNIT_PREFIXES = [
selector.SelectOptionDict(value="none", label="none"),
selector.SelectOptionDict(value="k", label="k (kilo)"),
selector.SelectOptionDict(value="M", label="M (mega)"),
selector.SelectOptionDict(value="G", label="G (giga)"),
@ -74,7 +73,7 @@ CONFIG_SCHEMA = vol.Schema(
unit_of_measurement="decimals",
),
),
vol.Required(CONF_UNIT_PREFIX, default="none"): selector.SelectSelector(
vol.Optional(CONF_UNIT_PREFIX): selector.SelectSelector(
selector.SelectSelectorConfig(options=UNIT_PREFIXES),
),
vol.Required(CONF_UNIT_TIME, default=UnitOfTime.HOURS): selector.SelectSelector(

10
homeassistant/components/integration/sensor.py
View File

@ -77,7 +77,7 @@ PLATFORM_SCHEMA = vol.All(
vol.Optional(CONF_UNIQUE_ID): cv.string,
vol.Required(CONF_SOURCE_SENSOR): cv.entity_id,
vol.Optional(CONF_ROUND_DIGITS, default=DEFAULT_ROUND): vol.Coerce(int),
vol.Optional(CONF_UNIT_PREFIX, default=None): vol.In(UNIT_PREFIXES),
vol.Optional(CONF_UNIT_PREFIX): vol.In(UNIT_PREFIXES),
vol.Optional(CONF_UNIT_TIME, default=UnitOfTime.HOURS): vol.In(UNIT_TIME),
vol.Remove(CONF_UNIT_OF_MEASUREMENT): cv.string,
vol.Optional(CONF_METHOD, default=METHOD_TRAPEZOIDAL): vol.In(
@ -169,17 +169,13 @@ async def async_setup_entry(
else:
device_info = None
unit_prefix = config_entry.options[CONF_UNIT_PREFIX]
if unit_prefix == "none":
unit_prefix = None
integral = IntegrationSensor(
integration_method=config_entry.options[CONF_METHOD],
name=config_entry.title,
round_digits=int(config_entry.options[CONF_ROUND_DIGITS]),
source_entity=source_entity_id,
unique_id=config_entry.entry_id,
unit_prefix=unit_prefix,
unit_prefix=config_entry.options.get(CONF_UNIT_PREFIX),
unit_time=config_entry.options[CONF_UNIT_TIME],
device_info=device_info,
)
@ -200,7 +196,7 @@ async def async_setup_platform(
round_digits=config[CONF_ROUND_DIGITS],
source_entity=config[CONF_SOURCE_SENSOR],
unique_id=config.get(CONF_UNIQUE_ID),
unit_prefix=config[CONF_UNIT_PREFIX],
unit_prefix=config.get(CONF_UNIT_PREFIX),
unit_time=config[CONF_UNIT_TIME],
)

3
tests/components/integration/test_config_flow.py
View File

@ -33,7 +33,6 @@ async def test_config_flow(hass: HomeAssistant, platform) -> None:
"name": "My integration",
"round": 1,
"source": input_sensor_entity_id,
"unit_prefix": "none",
"unit_time": "min",
},
)
@ -47,7 +46,6 @@ async def test_config_flow(hass: HomeAssistant, platform) -> None:
"name": "My integration",
"round": 1.0,
"source": "sensor.input",
"unit_prefix": "none",
"unit_time": "min",
}
assert len(mock_setup_entry.mock_calls) == 1
@ -59,7 +57,6 @@ async def test_config_flow(hass: HomeAssistant, platform) -> None:
"name": "My integration",
"round": 1.0,
"source": "sensor.input",
"unit_prefix": "none",
"unit_time": "min",
}
assert config_entry.title == "My integration"