Make config data changeable in the options dialog

custom_components/omnik_inverter/config_flow.py

@@ -15,6 +15,11 @@
 )
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)
 from omnikinverter import OmnikInverter, OmnikInverterError
 
 from .const import (
@@ -274,6 +279,7 @@ def __init__(self, config_entry: ConfigEntry) -> None:
             config_entry: The ConfigEntry instance.
         """
         self.config_entry = config_entry
+        self.source_type = config_entry.data[CONF_SOURCE_TYPE]
 
     async def async_step_init(
         self, user_input: dict[str, Any] | None = None
@@ -287,20 +293,74 @@ async def async_step_init(
         Returns:
             The created config entry.
         """
+        errors = {}
+
         if user_input is not None:
-            return self.async_create_entry(title="", data=user_input)
+            try:
+                await validate_input(user_input)
+            except OmnikInverterError:
+                LOGGER.exception("Failed to connect to the Omnik")
+                errors["base"] = "cannot_connect"
+            except Exception as error:  # pylint: disable=broad-except
+                errors["base"] = str(error)
+            else:
+                updated_config = {CONF_SOURCE_TYPE: self.source_type}
+                for key in (CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_SERIAL):
+                    if key in user_input:
+                        updated_config[key] = user_input[key]
+
+                self.hass.config_entries.async_update_entry(
+                    self.config_entry,
+                    data=updated_config,
+                    title=user_input.get(CONF_NAME),
+                )
+
+                options = {}
+                for key in (CONF_SCAN_INTERVAL, CONF_USE_CACHE):
+                    options[key] = user_input[key]
+                return self.async_create_entry(title="", data=options)
+
+        fields = {
+            vol.Optional(
+                CONF_NAME,
+                default=self.config_entry.title,
+            ): str,
+            vol.Required(
+                CONF_HOST,
+                default=self.config_entry.data.get(CONF_HOST),
+            ): str,
+        }
+
+        if self.source_type == "html":
+            fields[
+                vol.Required(
+                    CONF_USERNAME, default=self.config_entry.data.get(CONF_USERNAME)
+                )
+            ] = str
+            fields[
+                vol.Required(
+                    CONF_PASSWORD, default=self.config_entry.data.get(CONF_PASSWORD)
+                )
+            ] = TextSelector(TextSelectorConfig(type=TextSelectorType.PASSWORD))
+        elif self.source_type == "tcp":
+            fields[
+                vol.Required(
+                    CONF_SERIAL, default=self.config_entry.data.get(CONF_SERIAL)
+                )
+            ] = str
+
+        fields[
+            vol.Optional(
+                CONF_SCAN_INTERVAL,
+                default=self.config_entry.options.get(
+                    CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
+                ),
+            )
+        ] = vol.All(vol.Coerce(int), vol.Range(min=1))
+        fields[vol.Optional(CONF_USE_CACHE, default=False)] = bool
 
         return self.async_show_form(
             step_id="init",
-            data_schema=vol.Schema(
-                {
-                    vol.Optional(
-                        CONF_SCAN_INTERVAL,
-                        default=self.config_entry.options.get(
-                            CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
-                        ),
-                    ): vol.All(vol.Coerce(int), vol.Range(min=1)),
-                    vol.Optional(CONF_USE_CACHE, default=False): bool,
-                }
-            ),
+            data_schema=vol.Schema(fields),
+            errors=errors,
         )

custom_components/omnik_inverter/strings.json

@@ -36,6 +36,10 @@
       "init": {
         "description": "Change the way the integration fetches your Omnik Inverter.",
         "data": {
+          "name": "[%key:common::config_flow::data::name%]",
+          "host": "[%key:common::config_flow::data::host%]",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]",
           "scan_interval": "Minimum time between entity updates [m]",
           "use_cache": "Cache the total power of today"
         }

custom_components/omnik_inverter/translations/de.json

@@ -45,6 +45,11 @@
         "step": {
             "init": {
                 "data": {
+                    "name": "Name",
+                    "host": "Host",
+                    "username": "Benutzername",
+                    "password": "Passwort",
+                    "serial": "Seriennummer",
                     "scan_interval": "Aktualisierungsintervall der Daten (Minuten)",
                     "use_cache": "Den gesamten Tagesumsatz zwischenspeichern"
                 },

custom_components/omnik_inverter/translations/en.json

@@ -45,6 +45,11 @@
         "step": {
             "init": {
                 "data": {
+                    "name": "Name",
+                    "host": "Host",
+                    "username": "Username",
+                    "password": "Password",
+                    "serial": "Serial Number",
                     "scan_interval": "Minimum time between entity updates [m]",
                     "use_cache": "Cache the total power of today"
                 },

custom_components/omnik_inverter/translations/nl.json

@@ -45,6 +45,11 @@
         "step": {
             "init": {
                 "data": {
+                    "name": "Naam",
+                    "host": "Host",
+                    "username": "Gebruikersnaam",
+                    "password": "Wachtwoord",
+                    "serial": "Serienummer",
                     "scan_interval": "Minimale tijd tussen entiteitsupdates [m]",
                     "use_cache": "Cache de dagopbrengst"
                 },