From 81ebd61d6204f707f4628512b05dfe953e0796ed Mon Sep 17 00:00:00 2001
From: Daniel Lando <daniel.sorridi@gmail.com>
Date: Mon, 27 Jan 2025 19:04:05 +0100
Subject: [PATCH 1/2] feat(mqtt-discovery): gateway values setting to enable by
 default Configuration CC entities (#4106)

---
 api/lib/Gateway.ts                            |  8 ++++
 src/components/dialogs/DialogGatewayValue.vue | 38 +++++++++++--------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/api/lib/Gateway.ts b/api/lib/Gateway.ts
index 92754f8acfc..5c413cfecae 100644
--- a/api/lib/Gateway.ts
+++ b/api/lib/Gateway.ts
@@ -164,6 +164,7 @@ export type GatewayValue = {
 	receiveFunction?: string
 	qos?: 0 | 1 | 2
 	retain?: boolean
+	ccConfigEnableDiscovery?: boolean
 }
 
 export type ScheduledJob = {
@@ -1753,6 +1754,13 @@ export default class Gateway {
 						default:
 							return
 					}
+
+					// by default configuration CC discovery entities are disabled
+					// them can be enabled by setting ccConfigEnableDiscovery to true
+					// on gateway values configuration
+					cfg.discovery_payload.enabled_by_default =
+						!!valueConf?.ccConfigEnableDiscovery
+
 					break
 				}
 				default:
diff --git a/src/components/dialogs/DialogGatewayValue.vue b/src/components/dialogs/DialogGatewayValue.vue
index 4e7445ed999..4ff5f9755bd 100644
--- a/src/components/dialogs/DialogGatewayValue.vue
+++ b/src/components/dialogs/DialogGatewayValue.vue
@@ -133,12 +133,12 @@
 								></v-text-field>
 							</v-col>
 							<v-col cols="6">
-								<v-switch
+								<v-checkbox
 									label="Poll"
 									hint="Enable poll of this value. ATTENTION: This could create lot traffic in your network and kill the life of battery powered devices. Use at your own risk"
 									persistent-hint
 									v-model="editedValue.enablePoll"
-								></v-switch>
+								></v-checkbox>
 							</v-col>
 							<v-col v-if="editedValue.enablePoll" cols="6">
 								<v-text-field
@@ -151,25 +151,31 @@
 									type="number"
 								></v-text-field>
 							</v-col>
-							<!--
-              <v-col cols="6">
-                <v-switch
-                  label="Verify changes"
-                  hint="Verify changes of this value"
-                  persistent-hint
-                  v-model="editedValue.verifyChanges"
-                ></v-switch>
-              </v-col>
 
-              -->
+							<v-col
+								cols="6"
+								v-if="
+									editedValue.value &&
+									editedValue.value.commandClass === 112
+								"
+							>
+								<v-checkbox
+									label="Enable discovery"
+									hint="Configuration CC values are disabled by default in MQTT discovery. Set this to true to force enable them"
+									persistent-hint
+									v-model="
+										editedValue.ccConfigEnableDiscovery
+									"
+								></v-checkbox>
+							</v-col>
 
 							<v-col cols="6">
-								<v-switch
+								<v-checkbox
 									label="Parse send"
 									hint="Create a function that parse the value sent via MQTT"
 									persistent-hint
 									v-model="editedValue.parseSend"
-								></v-switch>
+								></v-checkbox>
 							</v-col>
 
 							<v-container v-if="editedValue.parseSend">
@@ -189,12 +195,12 @@
 							</v-container>
 
 							<v-col cols="6">
-								<v-switch
+								<v-checkbox
 									label="Parse receive"
 									hint="Create a function that parse the received value from MQTT"
 									persistent-hint
 									v-model="editedValue.parseReceive"
-								></v-switch>
+								></v-checkbox>
 							</v-col>
 
 							<v-container v-if="editedValue.parseReceive">

From bbd9b35920da23def2c718313617765bc036fb95 Mon Sep 17 00:00:00 2001
From: Z-Wave JS Bot <bot@zwave-js.io>
Date: Mon, 27 Jan 2025 18:06:54 +0000
Subject: [PATCH 2/2] Release 9.30.0

---
 CHANGELOG.md      | 18 ++++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 579d0d95f80..d6909df5cd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 
 
+# [9.30.0](https://github.com/zwave-js/zwave-js-ui/compare/v9.29.1...v9.30.0) (2025-01-27)
+
+
+### Bug Fixes
+
+* **logger:** standardize module name formatting to uppercase ([dfa47a9](https://github.com/zwave-js/zwave-js-ui/commit/dfa47a949101fe23c79aff9e0b02faaad11592aa))
+* store nodes preferences in `nodes.json` using homeHex ([#4104](https://github.com/zwave-js/zwave-js-ui/issues/4104)) ([e913f10](https://github.com/zwave-js/zwave-js-ui/commit/e913f10b0c1cb008de22148a07a5763e8633defa))
+* **ui:** abort link reliability check on dialog close ([54224d2](https://github.com/zwave-js/zwave-js-ui/commit/54224d21a080ed19d3a6c214d95db23f2a86e3fb)), closes [#4105](https://github.com/zwave-js/zwave-js-ui/issues/4105)
+* **ui:** cleaner popup text when refreshing associations ([abe7137](https://github.com/zwave-js/zwave-js-ui/commit/abe71370a31c31635144dff0b2731eea649842e6)), closes [#4100](https://github.com/zwave-js/zwave-js-ui/issues/4100)
+* **ui:** move rebuild routes back to general actions ([c5d9691](https://github.com/zwave-js/zwave-js-ui/commit/c5d96914ebf2aafed52f675288b7ee15693647d9)), closes [#3559](https://github.com/zwave-js/zwave-js-ui/issues/3559)
+* use `uncaughtException` to catch missing exceptions ([4905e0c](https://github.com/zwave-js/zwave-js-ui/commit/4905e0c2c64f8c7c60bf456cbae611ff16f99200)), closes [#4098](https://github.com/zwave-js/zwave-js-ui/issues/4098)
+
+
+### Features
+
+* bump @kvaster/zwavejs-prom plugin to 0.0.3 ([c373290](https://github.com/zwave-js/zwave-js-ui/commit/c373290a949122624307debe189d935af9de1acd)), closes [#4096](https://github.com/zwave-js/zwave-js-ui/issues/4096)
+* **mqtt-discovery:** gateway values setting to enable by default Configuration CC entities ([#4106](https://github.com/zwave-js/zwave-js-ui/issues/4106)) ([81ebd61](https://github.com/zwave-js/zwave-js-ui/commit/81ebd61d6204f707f4628512b05dfe953e0796ed))
+
 ## [9.29.1](https://github.com/zwave-js/zwave-js-ui/compare/v9.29.0...v9.29.1) (2025-01-16)
 
 
diff --git a/package-lock.json b/package-lock.json
index d96453df7c1..215a3b51d1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "zwave-js-ui",
-  "version": "9.29.1",
+  "version": "9.30.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "zwave-js-ui",
-      "version": "9.29.1",
+      "version": "9.30.0",
       "license": "MIT",
       "dependencies": {
         "@esm2cjs/escape-string-regexp": "^5.0.0",
diff --git a/package.json b/package.json
index 2d7d651af8b..24c43b9e37b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zwave-js-ui",
-  "version": "9.29.1",
+  "version": "9.30.0",
   "description": "Z-Wave Control Panel and MQTT Gateway",
   "keywords": [
     "mqtt",