Merge pull request #327 from vincentwolsink/advanced_options

Hide token source selection under advanced options

Author: vincentwolsink

custom_components/enphase_envoy/config_flow.py

@@ -18,7 +18,7 @@
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import FlowResult
+from homeassistant.data_entry_flow import FlowResult, section
 from homeassistant.helpers import config_validation as cv
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.util.network import is_ipv4_address, is_ipv6_address
@@ -42,6 +42,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 ENVOY = "Envoy"
+ADVANCED_OPTIONS = "advanced_options"
 
 
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> EnvoyReader:
@@ -52,7 +53,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> EnvoyRead
         enlighten_pass=data[CONF_PASSWORD],
         inverters=False,
         enlighten_serial_num=data[CONF_SERIAL],
-        token_source=data[CONF_TOKEN_SOURCE],
+        token_source=data[ADVANCED_OPTIONS][CONF_TOKEN_SOURCE],
     )
 
     try:
@@ -100,11 +101,17 @@ def _async_generate_schema(self):
         schema[vol.Required(CONF_PASSWORD, default=default_data.get(CONF_PASSWORD))] = (
             str
         )
-        schema[
-            vol.Required(
-                CONF_TOKEN_SOURCE, default=default_data.get(CONF_TOKEN_SOURCE, "entrez")
-            )
-        ] = vol.In(["entrez", "enlighten"])
+        schema[vol.Required(ADVANCED_OPTIONS)] = section(
+            vol.Schema(
+                {
+                    vol.Required(
+                        CONF_TOKEN_SOURCE,
+                        default=default_data.get(CONF_TOKEN_SOURCE, "entrez"),
+                    ): vol.In(["entrez", "enlighten"])
+                }
+            ),
+            {"collapsed": True},
+        )
 
         return vol.Schema(schema)
 
@@ -215,6 +222,9 @@ async def async_step_user(
                 data = user_input.copy()
                 data[CONF_NAME] = self._async_envoy_name()
 
+                advanced_options = data.pop(ADVANCED_OPTIONS)
+                data[CONF_TOKEN_SOURCE] = advanced_options[CONF_TOKEN_SOURCE]
+
                 if self._current_entry:
                     # Remove saved token to prevent it being used after reconfire
                     store = Store(

custom_components/enphase_envoy/strings.json

@@ -8,8 +8,15 @@
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "serial": "Serial Number",
-          "token_source": "Login method (token source)"
+          "serial": "Serial Number"
+        },
+        "sections": {
+          "advanced_options": {
+            "name": "Advanced options",
+            "data": {
+              "token_source": "Login method (token source)"
+            }
+          }
         }
       }
     },

custom_components/enphase_envoy/translations/en.json

@@ -12,14 +12,21 @@
     "flow_title": "{serial} ({host})",
     "step": {
       "user": {
+        "description": "Enter the hostname/ip and serial of your Envoy. Use your Enphase (installer) account credentials.",
         "data": {
           "host": "Host",
           "username": "Username",
           "password": "Password",
-          "serial": "Serial number",
-          "token_source": "Login method (token source)"
+          "serial": "Serial number"
         },
-        "description": "Enter the hostname/ip and serial of your Envoy. Use your Enphase (installer) account credentials."
+        "sections": {
+          "advanced_options": {
+            "name": "Advanced options",
+            "data": {
+              "token_source": "Login method (token source)"
+            }
+          }
+        }
       }
     }
   },

custom_components/enphase_envoy/translations/nl.json

@@ -1,27 +1,34 @@
 {
   "config": {
-      "abort": {
-          "already_configured": "Apparaat is al geconfigureerd",
-          "reauth_successful": "Herauthenticatie was succesvol"
-      },
-      "error": {
-          "cannot_connect": "Kan geen verbinding maken met Envoy. Controleer host en serienummer.",
-          "invalid_auth": "Inloggen mislukt. Controleer Enphase gebruikersnaam/wachtwoord.",
-          "unknown": "Onverwachte fout"
-      },
-      "flow_title": "{serial} ({host})",
-      "step": {
-          "user": {
-              "data": {
-                  "host": "Host",
-                  "username": "Gebruikersnaam",
-                  "password": "Wachtwoord",
-                  "serial": "Serienummer",
-                  "token_source": "Login methode (token bron)"
-              },
-              "description": "Voer de hostname/ip en serienummer van je Envoy in. Gebruik je Enphase (installer) account gegevens."
+    "abort": {
+      "already_configured": "Apparaat is al geconfigureerd",
+      "reauth_successful": "Herauthenticatie was succesvol"
+    },
+    "error": {
+      "cannot_connect": "Kan geen verbinding maken met Envoy. Controleer host en serienummer.",
+      "invalid_auth": "Inloggen mislukt. Controleer Enphase gebruikersnaam/wachtwoord.",
+      "unknown": "Onverwachte fout"
+    },
+    "flow_title": "{serial} ({host})",
+    "step": {
+      "user": {
+        "description": "Voer de hostname/ip en serienummer van je Envoy in. Gebruik je Enphase (installer) account gegevens.",
+        "data": {
+          "host": "Host",
+          "username": "Gebruikersnaam",
+          "password": "Wachtwoord",
+          "serial": "Serienummer"
+        },
+        "sections": {
+          "advanced_options": {
+            "name": "Geavanceerde opties",
+            "data": {
+              "token_source": "Login methode (token bron)"
+            }
           }
+        }
       }
+    }
   },
   "selector": {
     "token_source": {