From 6f0b02e0093cc7fd61d30c00fb1cd61d0cfdf09f Mon Sep 17 00:00:00 2001
From: Patrick ZAJDA <patrick@zajda.fr>
Date: Sat, 17 Jan 2026 15:25:36 +0100
Subject: [PATCH] fix: Home Assistant: expose group settings override (#30627)

Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
---
 lib/util/settings.schema.json         | 11 +++++++++++
 test/extensions/homeassistant.test.ts |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/util/settings.schema.json b/lib/util/settings.schema.json
index 4dbd098f..b4557170 100644
--- a/lib/util/settings.schema.json
+++ b/lib/util/settings.schema.json
@@ -965,6 +965,17 @@
                     "items": {
                         "type": "string"
                     }
+                },
+                "homeassistant": {
+                    "type": ["object", "null"],
+                    "title": "Home Assistant",
+                    "properties": {
+                        "name": {
+                            "type": ["string", "null"],
+                            "title": "Home Assistant name",
+                            "description": "Name of the group in Home Assistant"
+                        }
+                    }
                 }
             },
             "required": ["friendly_name"]
diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts
index e6ab4c5e..7ee16fac 100644
--- a/test/extensions/homeassistant.test.ts
+++ b/test/extensions/homeassistant.test.ts
@@ -129,6 +129,7 @@ describe("Extension: HomeAssistant", () => {
 
     it("Should discover devices and groups", async () => {
         settings.set(["homeassistant", "experimental_event_entities"], true);
+        settings.set(["groups", "9", "homeassistant"], {name: "HA Discovery Group", icon: "mdi:lightbulb-group"});
         await resetExtension();
 
         let payload;
@@ -140,12 +141,13 @@ describe("Extension: HomeAssistant", () => {
             command_topic: "zigbee2mqtt/ha_discovery_group/set",
             device: {
                 identifiers: ["zigbee2mqtt_1221051039810110150109113116116_9"],
-                name: "ha_discovery_group",
+                name: "HA Discovery Group",
                 sw_version: version,
                 model: "Group",
                 manufacturer: "Zigbee2MQTT",
                 via_device: "zigbee2mqtt_bridge_0x00124b00120144ae",
             },
+            icon: "mdi:lightbulb-group",
             max_mireds: 454,
             min_mireds: 250,
             name: null,
@@ -209,12 +211,13 @@ describe("Extension: HomeAssistant", () => {
             command_topic: "zigbee2mqtt/ha_discovery_group/set",
             device: {
                 identifiers: ["zigbee2mqtt_1221051039810110150109113116116_9"],
-                name: "ha_discovery_group",
+                name: "HA Discovery Group",
                 sw_version: version,
                 model: "Group",
                 manufacturer: "Zigbee2MQTT",
                 via_device: "zigbee2mqtt_bridge_0x00124b00120144ae",
             },
+            icon: "mdi:lightbulb-group",
             name: null,
             payload_off: "OFF",
             payload_on: "ON",