From 259abe6279c531211a1ac6f1ad6a0d72e8e03433 Mon Sep 17 00:00:00 2001
From: ChrisTerBeke <1134120+ChrisTerBeke@users.noreply.github.com>
Date: Mon, 4 Nov 2024 22:32:43 +0100
Subject: [PATCH] Group IP settings, add default label value to prevent error

---
 app.json                           | 47 ++++++++++++++++++------------
 drivers/uponor/driver.compose.json | 47 ++++++++++++++++++------------
 2 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/app.json b/app.json
index afb37c0..ff05d5f 100644
--- a/app.json
+++ b/app.json
@@ -80,27 +80,36 @@
       ],
       "settings": [
         {
-          "id": "discovered_address",
-          "label": {
-            "en": "IP Address",
-            "nl": "IP-adres"
-          },
-          "type": "label",
-          "required": false,
-          "highlight": true
-        },
-        {
-          "id": "address",
+          "type": "group",
           "label": {
-            "en": "Override IP Address",
-            "nl": "IP-adres overschrijven"
+            "en": "IP address",
+            "nl": "IP addres"
           },
-          "type": "text",
-          "required": false,
-          "hint": {
-            "en": "Overrides the auto-discovered IP address of the device.",
-            "nl": "Overschrijft het automatisch ontdekte IP-adres van het apparaat."
-          }
+          "children": [
+            {
+              "id": "discovered_address",
+              "label": {
+                "en": "Auto-discovered address",
+                "nl": "Automatisch ontdekte adres"
+              },
+              "type": "label",
+              "required": false,
+              "value": ""
+            },
+            {
+              "id": "address",
+              "label": {
+                "en": "Override IP Address",
+                "nl": "IP-adres overschrijven"
+              },
+              "type": "text",
+              "required": false,
+              "hint": {
+                "en": "Overrides the auto-discovered IP address of the device.",
+                "nl": "Overschrijft het automatisch ontdekte IP-adres van het apparaat."
+              }
+            }
+          ]
         },
         {
           "type": "group",
diff --git a/drivers/uponor/driver.compose.json b/drivers/uponor/driver.compose.json
index da7b742..4b6b2d3 100644
--- a/drivers/uponor/driver.compose.json
+++ b/drivers/uponor/driver.compose.json
@@ -43,27 +43,36 @@
     ],
     "settings": [
         {
-            "id": "discovered_address",
-            "label": {
-                "en": "IP Address",
-                "nl": "IP-adres"
-            },
-            "type": "label",
-            "required": false,
-            "highlight": true
-        },
-        {
-            "id": "address",
+            "type": "group",
             "label": {
-                "en": "Override IP Address",
-                "nl": "IP-adres overschrijven"
+                "en": "IP address",
+                "nl": "IP addres"
             },
-            "type": "text",
-            "required": false,
-            "hint": {
-                "en": "Overrides the auto-discovered IP address of the device.",
-                "nl": "Overschrijft het automatisch ontdekte IP-adres van het apparaat."
-            }
+            "children": [
+                {
+                    "id": "discovered_address",
+                    "label": {
+                        "en": "Auto-discovered address",
+                        "nl": "Automatisch ontdekte adres"
+                    },
+                    "type": "label",
+                    "required": false,
+                    "value": ""
+                },
+                {
+                    "id": "address",
+                    "label": {
+                        "en": "Override IP Address",
+                        "nl": "IP-adres overschrijven"
+                    },
+                    "type": "text",
+                    "required": false,
+                    "hint": {
+                        "en": "Overrides the auto-discovered IP address of the device.",
+                        "nl": "Overschrijft het automatisch ontdekte IP-adres van het apparaat."
+                    }
+                }
+            ]
         },
         {
             "type": "group",