node-red-contrib-knx-ultimate 6.3.7 → 6.3.8

package/CHANGELOG.md

@@ -6,9 +6,13 @@
 
 # CHANGELOG
 
+**Version 6.3.8** - August 2026<br/>
+
+- **HUE Controller**: fixed Light and grouped-light mapping tabs remaining hidden when Node-RED emits temporary empty KNX/Hue config-selector values during editor initialization; saved gateways now survive bootstrap and remount, while only an explicit user selection of `none` hides the mapping tabs.<br/>
+
 **Version 6.3.7** - August 2026<br/>
 
-- **HUE Controller**: improved gateway-dependent editor visibility, preserving all KNX mappings and the correct tab layout when gateways are deselected, reselected or temporarily unavailable; obsolete headings and decorative tab images were removed.<br/>
+- **HUE Controller**: improved gateway-dependent editor visibility, preserving all KNX mappings and restoring the correct tab layout when gateways are deselected or reselected; obsolete headings and decorative images were removed.<br/>
 - **HUE Controller**: added clearer Hue Bridge loading/offline feedback, kept saved mappings visible while disabling unavailable device discovery, and restored the complete previous configuration when the editor is cancelled after previewing another Hue resource.<br/>
 
 **Version 6.3.6** - August 2026<br/>

package/nodes/knxUltimateHueController.html

@@ -1,5 +1,6 @@
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/11f26b4500.js"></script>
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/htmlUtils.js"></script>
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/hueControllerEditorSelection.js"></script>
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/hueControllerProfiles.js"></script>
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/hueControllerMigration.js"></script>
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/hueControllerMigrationDialog.js"></script>
@@ -47,6 +48,24 @@
     };
     const TUTORIALS_URL = 'https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E';
     const profileBundle = window.KNXUltimateHueControllerProfiles;
+    const editorSelection = window.KNXUltimateHueControllerEditorSelection;
+    const shouldPreserveStoredSelection = editorSelection && typeof editorSelection.shouldPreserveStoredSelection === 'function'
+      ? editorSelection.shouldPreserveStoredSelection
+      : (event, nextValue, storedValue, emptyValues) => {
+          const programmaticChange = !event || !event.originalEvent;
+          const normalizedNext = nextValue === undefined || nextValue === null ? '' : String(nextValue).trim().toLowerCase();
+          const normalizedStored = storedValue === undefined || storedValue === null ? '' : String(storedValue).trim().toLowerCase();
+          return programmaticChange && emptyValues.has(normalizedNext) && !emptyValues.has(normalizedStored);
+        };
+    const resolveSelectedOrStoredSelection = editorSelection && typeof editorSelection.resolveSelectedOrStoredSelection === 'function'
+      ? editorSelection.resolveSelectedOrStoredSelection
+      : (selectedValue, storedValue, emptyValues) => {
+          const selected = selectedValue === undefined || selectedValue === null ? '' : String(selectedValue).trim();
+          const stored = storedValue === undefined || storedValue === null ? '' : String(storedValue).trim();
+          return emptyValues.has(selected.toLowerCase())
+            ? (emptyValues.has(stored.toLowerCase()) ? '' : stored)
+            : selected;
+        };
 
     const getProfileDefinition = (controllerType) => {
       // The bundle captures a private definition through a RED facade. It does
@@ -373,9 +392,12 @@
           const draft = {};
           Object.keys(definition?.defaults || {}).forEach((key) => {
             const fieldValue = readFieldValue($(`#node-input-${key}`), controllerNode[key]);
-            const value = key === 'server'
-              ? normalizeKnxServerSelection(fieldValue)
-              : (key === 'serverHue' ? normalizeHueServerSelection(fieldValue) : fieldValue);
+            let value = fieldValue;
+            if (key === 'server') {
+              value = resolveSelectedOrStoredSelection(fieldValue, controllerNode.server, KNX_EMPTY_SERVER_VALUES);
+            } else if (key === 'serverHue') {
+              value = resolveSelectedOrStoredSelection(fieldValue, controllerNode.serverHue, HUE_EMPTY_SERVER_VALUES);
+            }
             controllerNode[key] = value;
             legacyContext[key] = value;
             draft[key] = cloneEditorValue(value);
@@ -764,6 +786,7 @@
           $container.find('.form-tips').remove();
 
           const $knxFlowOnlyNotice = $container.find('.hue-controller-knx-flow-only-notice');
+          const $lightTabs = $container.find('#tabs');
           let knxFlowOnlyNoticeText = 'To display the group-address mappings, select a KNX gateway. Without one, this node can only be controlled by input messages from the flow.';
           try {
             const noticeKey = 'node-red-contrib-knx-ultimate/knxUltimateHueController:knxUltimateHueController.knx_gateway_required_for_mappings';
@@ -789,12 +812,30 @@
             const knxDisabled = !hasDomServer && !hasStoredServer;
             $container.toggleClass('hue-controller-no-knx', knxDisabled);
             $knxFlowOnlyNotice.toggle(controllerType === 'light' && knxDisabled);
+            if (controllerType === 'light' && $lightTabs.length) {
+              // Device availability controls the outer profile container;
+              // KNX selection alone controls the nested mapping tabs.
+              const shouldShowLightTabs = !knxDisabled;
+              // The mature Light editor also manages this inline style. Make
+              // the wrapper authoritative after every lifecycle transition so
+              // a transient bootstrap value cannot leave display:none behind
+              // after the saved/selected KNX gateway has been restored.
+              $lightTabs.css('display', shouldShowLightTabs ? 'flex' : 'none');
+              if (shouldShowLightTabs) {
+                try { $lightTabs.tabs('refresh'); } catch (error) { /* raw tabs remain visible */ }
+              }
+            }
           };
-          const handleControllerKnxSelection = function () {
+          const handleControllerKnxSelection = function (event) {
             // An explicit user choice must supersede the persisted bootstrap
             // fallback. Node-RED can represent "none" as `_ADD_`, so normalize
             // it before both editors recalculate their visibility.
-            const selectedServer = normalizeKnxServerSelection($(this).val());
+            const selectedValue = $(this).val();
+            if (shouldPreserveStoredSelection(event, selectedValue, controllerNode.server, KNX_EMPTY_SERVER_VALUES)) {
+              updateControllerKnxVisibility();
+              return;
+            }
+            const selectedServer = normalizeKnxServerSelection(selectedValue);
             controllerNode.server = selectedServer;
             if (legacyContext) legacyContext.server = selectedServer;
             updateControllerKnxVisibility();
@@ -820,8 +861,14 @@
           });
         $(document)
           .off('change.knxUltimateHueControllerHueServer', '#node-input-serverHue')
-          .on('change.knxUltimateHueControllerHueServer', '#node-input-serverHue', () => {
-            const nextServerId = normalizeHueServerSelection($('#node-input-serverHue').val());
+          .on('change.knxUltimateHueControllerHueServer', '#node-input-serverHue', (event) => {
+            const selectedValue = $('#node-input-serverHue').val();
+            if (shouldPreserveStoredSelection(event, selectedValue, controllerNode.serverHue, HUE_EMPTY_SERVER_VALUES)) {
+              updateHueDeviceControlVisibility();
+              updateSelectedDevicePresentation();
+              return;
+            }
+            const nextServerId = normalizeHueServerSelection(selectedValue);
             if (nextServerId === activeHueServerId) return;
             activeHueServerId = nextServerId;
             controllerNode.serverHue = nextServerId;
@@ -1021,6 +1068,8 @@ Dedicated legacy HUE nodes remain registered for existing flows, but are frozen
 
 When no **KNX Gateway** is selected (including **none** and **Add new...**), only the Light mapping tabs are hidden. Their mounted GA, DPT and Name fields remain unchanged and reappear immediately with the correct vertical tab layout when the gateway is selected again. Hue resource selection and flow-only options remain available.
 
+Temporary placeholder values emitted programmatically by Node-RED while the KNX and Hue configuration selectors initialize do not replace saved gateways. Only an explicit user selection of **none** hides the Light mapping tabs.
+
 The Light mapping tabs contain only configuration controls; the decorative Dim, Tunable White and RGB images have been removed.
 
 For a single light, the **Dim**, **Tunable White**, **RGB/HSV**, and native-effects sections are enabled from the live capabilities reported by the selected Hue API v2 light resource. A light that exposes `dimming`, `color_temperature`, or `color` therefore shows the corresponding KNX mappings automatically.

package/nodes/locales/de/knxUltimateHueController.html

@@ -10,6 +10,7 @@
 <p>KNX-Zuordnungszeilen halten GA, DPT und Name in einer Zeile. DPT-Auswahl und Namensfeld verwenden kompakte Breiten; das Namensfeld kann sich in schmalen Editoren weiter verkleinern, ohne den gespeicherten Text zu ändern. Gespeicherte DPT-Werte bleiben erhalten, während die Auswahloptionen asynchron geladen werden.</p>
 <p>Unterstützt werden Leuchten und Leuchtengruppen, Steckdosen, Taster, Tap dial, Bewegungs- und Kamerabewegungsressourcen, Kontakte, Lichtstärke, Temperatur, Luftfeuchtigkeit, Szenen, Batterie, Zigbee-Verbindung und Softwareupdate.</p>
 <p>Wenn kein <strong>KNX-Gateway</strong> ausgewählt ist (einschließlich <code>none</code> und <em>Neu hinzufügen...</em>), werden die Registerkarten der Leuchtenzuordnung ausgeblendet; die Auswahl der Hue-Ressource und reine Flow-Optionen bleiben verfügbar. Die zugehörigen Felder GA, DPT und Name bleiben eingebunden und behalten ihre Werte, wenn das Gateway erneut ausgewählt wird; dabei wird auch das vertikale Registerkartenlayout unverändert wiederhergestellt.</p>
+<p>Temporäre Platzhalterwerte, die Node-RED während der Initialisierung der KNX- und Hue-Konfigurationsauswahl programmgesteuert auslöst, ersetzen keine gespeicherten Gateways. Nur die ausdrückliche Benutzerauswahl von <code>none</code> blendet die Leuchtenzuordnungsregister aus.</p>
 <p>Die Registerkarten der Leuchtenzuordnung enthalten nur Konfigurationsfelder; die dekorativen Bilder für Dimmen, abstimmbares Weiß und RGB wurden entfernt.</p>
 <p>Bei einer einzelnen Leuchte richten sich die Bereiche <strong>Dimmen</strong>, <strong>Abstimmbares Weiß</strong>, <strong>RGB/HSV</strong> und native Effekte nach den Live-Fähigkeiten der ausgewählten Hue-API-v2-Ressource. Die zugehörigen KNX-Zuordnungen erscheinen automatisch, wenn die Leuchte <code>dimming</code>, <code>color_temperature</code> oder <code>color</code> bereitstellt.</p>
 <p>Der Leuchteneditor zeigt gespeicherte Zuordnungen sofort an, ohne auf den Hue-Ressourcencache der Runtime zu warten. Aktuelle Fähigkeiten werden im Hintergrund geladen; schlägt die Anfrage fehl, bleiben Zuordnungen und Pin-Auswahl verfügbar und eine feste rote Node-RED-Fehlermeldung meldet den Fehler.</p>

package/nodes/locales/en/knxUltimateHueController.html

@@ -10,6 +10,7 @@
 <p>KNX mapping rows keep GA, DPT and Name on one line. DPT selectors and Name fields use compact widths, and the Name field can contract further on narrow editor trays without changing its stored text. Saved DPT values are retained while the selector options load asynchronously.</p>
 <p>Supported functions: lights and grouped lights, plugs, buttons, Tap dial, motion and camera motion, contacts, light level, temperature, humidity, scenes, battery, Zigbee connectivity, and device software update.</p>
 <p>When no <strong>KNX Gateway</strong> is selected (including <code>none</code> and <em>Add new...</em>), the Light mapping tabs are hidden while Hue resource selection and flow-only options remain available. Their GA, DPT and Name fields stay mounted and retain their values when the gateway is selected again, with the vertical tab layout restored unchanged.</p>
+<p>Temporary placeholder values emitted programmatically by Node-RED while the KNX and Hue configuration selectors initialize do not replace saved gateways. Only an explicit user selection of <code>none</code> hides the Light mapping tabs.</p>
 <p>The Light mapping tabs contain only configuration controls; the decorative Dim, Tunable White and RGB images have been removed.</p>
 <p>For a single light, the <strong>Dim</strong>, <strong>Tunable White</strong>, <strong>RGB/HSV</strong>, and native-effects sections follow the live capabilities reported by the selected Hue API v2 resource. The corresponding KNX mappings appear automatically when the light exposes <code>dimming</code>, <code>color_temperature</code>, or <code>color</code>.</p>
 <p>The Light editor renders saved mappings immediately without waiting for the runtime Hue resource cache. Current capabilities load in the background; if that request fails, the saved mappings and pin selector remain available and a fixed red Node-RED error reports the failure.</p>

package/nodes/locales/es/knxUltimateHueController.html

@@ -10,6 +10,7 @@
 <p>Las filas de mapeo KNX mantienen GA, DPT y Nombre en una sola línea. Los campos DPT y Nombre usan anchos compactos; Nombre puede reducirse aún más en editores estrechos sin modificar el texto guardado. Los valores DPT guardados se conservan mientras las opciones del selector se cargan de forma asíncrona.</p>
 <p>Admite luces y grupos de luces, enchufes, botones, Tap dial, movimiento y movimiento de cámara, contactos, nivel de luz, temperatura, humedad, escenas, batería, conectividad Zigbee y actualización de software.</p>
 <p>Cuando no hay ningún <strong>Gateway KNX</strong> seleccionado (incluidos <code>none</code> y <em>Añadir nuevo...</em>), se ocultan las pestañas de mapeo de Luz; la selección del recurso Hue y las opciones exclusivas del flujo siguen disponibles. Sus campos GA, DPT y Nombre permanecen montados y conservan sus valores cuando se vuelve a seleccionar el gateway, restaurando también sin cambios el diseño vertical de las pestañas.</p>
+<p>Los valores temporales emitidos mediante programación por Node-RED mientras se inicializan los selectores de configuración KNX y Hue no sustituyen los gateways guardados. Solo una selección explícita de <code>none</code> oculta las pestañas de mapeo de Luz.</p>
 <p>Las pestañas de mapeo de Luz contienen únicamente los controles de configuración; se han eliminado las imágenes decorativas de Regulación, Blanco regulable y RGB.</p>
 <p>Para una luz individual, las secciones <strong>Regulación</strong>, <strong>Blanco regulable</strong>, <strong>RGB/HSV</strong> y efectos nativos siguen las capacidades en vivo declaradas por el recurso Hue API v2 seleccionado. Los mapeos KNX correspondientes aparecen automáticamente cuando la luz expone <code>dimming</code>, <code>color_temperature</code> o <code>color</code>.</p>
 <p>El editor de Luz muestra inmediatamente los mapeos guardados sin esperar a la caché de recursos Hue del runtime. Las capacidades actuales se cargan en segundo plano; si la solicitud falla, los mapeos y el selector de pines siguen disponibles y un error rojo fijo de Node-RED informa del fallo.</p>

package/nodes/locales/fr/knxUltimateHueController.html

@@ -10,6 +10,7 @@
 <p>Les lignes de mappage KNX conservent GA, DPT et Nom sur une seule ligne. Les champs DPT et Nom utilisent des largeurs compactes ; le champ Nom peut encore se réduire dans un éditeur étroit sans modifier le texte enregistré. Les valeurs DPT enregistrées sont conservées pendant le chargement asynchrone des options du sélecteur.</p>
 <p>Fonctions prises en charge : lampes et groupes, prises, boutons, Tap dial, mouvement et mouvement de caméra, contacts, niveau de lumière, température, humidité, scènes, batterie, connectivité Zigbee et mise à jour logicielle.</p>
 <p>Lorsqu'aucune <strong>Passerelle KNX</strong> n'est sélectionnée (y compris <code>none</code> et <em>Ajouter...</em>), les onglets de mappage Lampe sont masqués ; la sélection de la ressource Hue et les options réservées au flow restent disponibles. Leurs champs GA, DPT et Nom restent montés et conservent leurs valeurs lorsque la passerelle est à nouveau sélectionnée, tout comme la disposition verticale des onglets.</p>
+<p>Les valeurs temporaires émises par programmation par Node-RED pendant l'initialisation des sélecteurs de configuration KNX et Hue ne remplacent pas les passerelles enregistrées. Seule une sélection explicite de <code>none</code> masque les onglets de mappage Lampe.</p>
 <p>Les onglets de mappage Lampe contiennent uniquement les contrôles de configuration ; les images décoratives Variation, Blanc réglable et RGB ont été supprimées.</p>
 <p>Pour une lampe individuelle, les sections <strong>Variation</strong>, <strong>Blanc réglable</strong>, <strong>RGB/HSV</strong> et effets natifs suivent les capacités live déclarées par la ressource Hue API v2 sélectionnée. Les mappages KNX correspondants apparaissent automatiquement lorsque la lampe expose <code>dimming</code>, <code>color_temperature</code> ou <code>color</code>.</p>
 <p>L'éditeur Lampe affiche immédiatement les mappages enregistrés sans attendre le cache de ressources Hue de la runtime. Les capacités actuelles sont chargées en arrière-plan ; si la requête échoue, les mappages et le sélecteur de broches restent disponibles et une erreur Node-RED rouge et fixe signale l'échec.</p>

package/nodes/locales/it/knxUltimateHueController.html

@@ -10,6 +10,7 @@
 <p>Le righe di mappatura KNX mantengono GA, DPT e Nome sulla stessa linea. I campi DPT e Nome usano larghezze compatte e Nome può restringersi ulteriormente negli editor più stretti senza modificare il testo memorizzato. I valori DPT salvati vengono conservati mentre le opzioni del selettore si caricano in modo asincrono.</p>
 <p>Funzioni supportate: luci e gruppi di luci, prese, pulsanti, Tap dial, movimento e movimento telecamera, contatti, livello luce, temperatura, umidità, scene, batteria, connettività Zigbee e aggiornamento software.</p>
 <p>Quando non è selezionato alcun <strong>Gateway KNX</strong> (inclusi <code>none</code> e <em>Aggiungi nuovo...</em>), vengono nascoste le TAB delle mappature Luce, mentre la selezione della risorsa Hue e le opzioni per il solo flow restano disponibili. I relativi campi GA, DPT e Nome rimangono montati e conservano i valori quando il gateway viene riselezionato, ripristinando invariato anche il layout verticale delle TAB.</p>
+<p>I valori segnaposto temporanei emessi programmaticamente da Node-RED durante l'inizializzazione dei selettori KNX e Hue non sostituiscono i gateway salvati. Soltanto la selezione esplicita di <code>none</code> nasconde le TAB delle mappature Luce.</p>
 <p>Le TAB delle mappature Luce contengono soltanto i controlli di configurazione; le immagini decorative Dimmer, Bianco regolabile e RGB sono state eliminate.</p>
 <p>Per una luce singola, le sezioni <strong>Dimmer</strong>, <strong>Bianco regolabile</strong>, <strong>RGB/HSV</strong> ed effetti nativi seguono le capacità live dichiarate dalla risorsa Hue API v2 selezionata. Le relative mappature KNX appaiono automaticamente quando la luce espone <code>dimming</code>, <code>color_temperature</code> o <code>color</code>.</p>
 <p>L'editor Luce mostra subito le mappature salvate senza attendere la cache delle risorse Hue del runtime. Le capability correnti vengono caricate in background; se la richiesta fallisce, mappature e selettore dei pin restano disponibili e un errore Node-RED rosso e fisso segnala il problema.</p>

package/nodes/locales/zh-CN/knxUltimateHueController.html

@@ -10,6 +10,7 @@
 <p>KNX 映射行会将 GA、DPT 和名称保持在同一行。DPT 与名称字段采用紧凑宽度；在较窄的编辑器中，名称字段还可继续收缩，而不会更改已保存的文本。选择器选项异步加载时，已保存的 DPT 值会被保留。</p>
 <p>支持灯和灯组、插座、按钮、Tap dial、运动和摄像机运动、接触、光照度、温度、湿度、场景、电池、Zigbee 连接和设备软件更新。</p>
 <p>未选择<strong>KNX 网关</strong>时（包括 <code>none</code> 和“新增...”），灯光映射选项卡会隐藏，而 Hue 资源选择和仅用于流程的选项仍然可用。相关的 GA、DPT 和名称字段会保持挂载，并在重新选择网关时保留原值，同时完整恢复垂直选项卡布局。</p>
+<p>Node-RED 在初始化 KNX 和 Hue 配置选择器时以编程方式产生的临时占位值不会覆盖已保存的网关。只有用户明确选择 <code>none</code> 时才会隐藏灯光映射选项卡。</p>
 <p>灯光映射选项卡现在只包含配置控件；调光、可调白光和 RGB 装饰图片已移除。</p>
 <p>对于单灯，<strong>调光</strong>、<strong>可调白光</strong>、<strong>RGB/HSV</strong> 和原生效果部分会根据所选 Hue API v2 资源实时报告的能力显示。当灯具提供 <code>dimming</code>、<code>color_temperature</code> 或 <code>color</code> 时，相应的 KNX 映射会自动出现。</p>
 <p>灯光编辑器会立即显示已保存的映射，而无需等待运行时 Hue 资源缓存。当前能力在后台加载；如果请求失败，映射和引脚选择器仍然可用，并由固定的红色 Node-RED 错误消息报告失败。</p>

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=20.18.1"
   },
-  "version": "6.3.7",
+  "version": "6.3.8",
   "description": "KNX Ultimate is the most advanced KNX integration for Node-RED, providing secure KNX/IP communication, routing, ETS project import, Philips Hue, Matter Controller and Matter Bridge (control matter device via KNX and expose KNX GA via Matter), MQTT, diagnostics with AI, virtual devices, and powerful automation nodes. Build professional, reliable, and scalable smart home and building automation projects with minimal effort.",
   "files": [
     "nodes/",

package/resources/hueControllerEditorSelection.js

@@ -0,0 +1,32 @@
+(function (root, factory) {
+  const api = factory()
+  if (typeof module === 'object' && module.exports) module.exports = api
+  if (root) root.KNXUltimateHueControllerEditorSelection = api
+}(typeof window !== 'undefined' ? window : globalThis, function () {
+  const DEFAULT_EMPTY_VALUES = new Set(['', 'none', '_add_', '__none__'])
+
+  function normalizeSelection (value, emptyValues = DEFAULT_EMPTY_VALUES) {
+    const normalized = value === undefined || value === null ? '' : String(value).trim()
+    const normalizedEmptyValues = emptyValues instanceof Set
+      ? emptyValues
+      : new Set(Array.isArray(emptyValues) ? emptyValues : DEFAULT_EMPTY_VALUES)
+    return normalizedEmptyValues.has(normalized.toLowerCase()) ? '' : normalized
+  }
+
+  function shouldPreserveStoredSelection (event, nextValue, storedValue, emptyValues = DEFAULT_EMPTY_VALUES) {
+    const programmaticChange = !event || !event.originalEvent
+    return programmaticChange &&
+      normalizeSelection(nextValue, emptyValues) === '' &&
+      normalizeSelection(storedValue, emptyValues) !== ''
+  }
+
+  function resolveSelectedOrStoredSelection (selectedValue, storedValue, emptyValues = DEFAULT_EMPTY_VALUES) {
+    return normalizeSelection(selectedValue, emptyValues) || normalizeSelection(storedValue, emptyValues)
+  }
+
+  return {
+    normalizeSelection,
+    resolveSelectedOrStoredSelection,
+    shouldPreserveStoredSelection
+  }
+}))

package/resources/hueControllerProfiles.js

@@ -510,14 +510,17 @@
                   return resolveKnxServerValue() !== '';
                 };
 
-                const $tabs = $("#tabs");
+                // Scope the generic legacy ID to this Controller profile. Other
+                // Node-RED/config dialogs may contain their own #tabs element.
+                const $tabs = $('#hue-controller-profile-editor').find('#tabs');
                 const $pinSectionRow = $("#node-input-enableNodePINS").closest('.form-row');
                 const $pinSelect = $("#node-input-enableNodePINS");
                 const $pinInfoRow = $pinSectionRow.next('.form-tips');
                 const updateTabsVisibility = () => {
                   const knxSelected = hasKnxServerSelected();
-                  const hueDeviceSelected = getHueDeviceValue() !== '';
-                  const shouldShowTabs = knxSelected && hueDeviceSelected;
+                  // The unified wrapper owns device/profile visibility. Inside the
+                  // mounted Light profile, only KNX selection controls its GA tabs.
+                  const shouldShowTabs = knxSelected;
 
                   if (shouldShowTabs) {
                     // jQuery.show() restores a hidden div as display:block, which
@@ -1139,12 +1142,18 @@
 
                 $(document)
                   .off('change.knxUltimateHueLightGateway', '#node-input-server')
-                  .on('change.knxUltimateHueLightGateway', '#node-input-server', function () {
+                  .on('change.knxUltimateHueLightGateway', '#node-input-server', function (event) {
                     const selectedValue = $(this).val();
                     const normalizedValue = selectedValue === undefined || selectedValue === null
                       ? ''
                       : String(selectedValue).trim();
-                    node.server = KNX_EMPTY_VALUES.has(normalizedValue.toLowerCase()) ? '' : normalizedValue;
+                    const selectionApi = window.KNXUltimateHueControllerEditorSelection;
+                    const preserveStoredSelection = selectionApi && typeof selectionApi.shouldPreserveStoredSelection === 'function'
+                      ? selectionApi.shouldPreserveStoredSelection(event, selectedValue, node.server, KNX_EMPTY_VALUES)
+                      : ((!event || !event.originalEvent) && KNX_EMPTY_VALUES.has(normalizedValue.toLowerCase()) && resolveKnxServerValue() !== '');
+                    if (!preserveStoredSelection) {
+                      node.server = KNX_EMPTY_VALUES.has(normalizedValue.toLowerCase()) ? '' : normalizedValue;
+                    }
                     // Selecting none is a visibility change only. Keep every GA,
                     // DPT option and name mounted exactly as-is so selecting the
                     // gateway again cannot expose a half-empty mapping editor.
@@ -1281,9 +1290,9 @@
                     setAvailableEffects(effects);
                     // Check if grouped, to hide/show the "Get current" buttons
                     if (oLight.type === "grouped_light") {
-                      $("#tabs").tabs("enable", "#tabs-4");
-                      $("#tabs").tabs("enable", "#tabs-3");
-                      $("#tabs").tabs("enable", "#tabs-2");
+                      $tabs.tabs("enable", "#tabs-4");
+                      $tabs.tabs("enable", "#tabs-3");
+                      $tabs.tabs("enable", "#tabs-2");
                       $("#getColorAtSwitchOnDayTimeButton").show();
                       $("#getColorAtSwitchOnNightTimeButton").show();
                       $("#node-input-specifySwitchOnBrightness").empty().append(
@@ -1331,9 +1340,9 @@
                       );
                     }
 
-                    $("#tabs").tabs("disable", "#tabs-4");
-                    $("#tabs").tabs("disable", "#tabs-3");
-                    $("#tabs").tabs("disable", "#tabs-2");
+                    $tabs.tabs("disable", "#tabs-4");
+                    $tabs.tabs("disable", "#tabs-3");
+                    $tabs.tabs("disable", "#tabs-2");
                     $("#divColorsAtSwitchOn").hide();
                     $("#divColorsAtSwitchOnNightTime").hide();
                     $("#divTemperatureAtSwitchOn").hide();
@@ -1346,11 +1355,11 @@
 
                     // Enable options/tabs one by one
                     if (oLight.dimming !== undefined) {
-                      $("#tabs").tabs("enable", "#tabs-2");
+                      $tabs.tabs("enable", "#tabs-2");
                       $("#divBehaviourBrightness").show();
                     }
                     if (oLight.color !== undefined) {
-                      $("#tabs").tabs("enable", "#tabs-4");
+                      $tabs.tabs("enable", "#tabs-4");
                       $("#divColorsAtSwitchOn").show();
                       $("#divColorsAtSwitchOnNightTime").show();
                       $("#divColorCycle").show();
@@ -1367,7 +1376,7 @@
                     }
                     // Check temperature (if the light supports temperature, it support dimming as well)
                     if (oLight.color_temperature !== undefined) {
-                      $("#tabs").tabs("enable", "#tabs-3");
+                      $tabs.tabs("enable", "#tabs-3");
                       //$("#tabs").tabs("enable", "#tabs-2");
                       $("#node-input-specifySwitchOnBrightness").append(
                         $("<option>")