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

package/CHANGELOG.md

@@ -6,6 +6,15 @@
 
 # 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 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/>
 
 - **HUE Controller**: grouped lights now always show the complete Light mapping editor when KNX is configured, without checking child-light capabilities.<br/>

package/nodes/hue-config.js

@@ -367,16 +367,26 @@ module.exports = (RED) => {
             node.sysLogger?.warn(`KNXUltimateHue: getResources force refresh failed ${error.message}`)
           }
         }
-        if (node.hueAllResources === undefined) return
         if (_rtype === 'hue_controller') {
+          const ready = node.linkStatus === 'connected' && Array.isArray(node.hueAllResources)
+          if (!ready) {
+            return {
+              devices: [],
+              ready: false,
+              connectionStatus: node.linkStatus
+            }
+          }
           const resourceResults = await Promise.all(HUE_CONTROLLER_RESOURCE_TYPES.map(async (resourceType) => {
             const result = await node.getResources(resourceType)
             return [resourceType, Array.isArray(result?.devices) ? result.devices : []]
           }))
           return {
-            devices: buildHueControllerResourceCatalog(Object.fromEntries(resourceResults))
+            devices: buildHueControllerResourceCatalog(Object.fromEntries(resourceResults)),
+            ready: true,
+            connectionStatus: node.linkStatus
           }
         }
+        if (node.hueAllResources === undefined) return
         // Returns capitalized string
         function capStr (s) {
           if (typeof s !== 'string') return ''

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>
@@ -37,8 +38,34 @@
     // gateways exist) and for "Add new..." (when none exist).
     const KNX_EMPTY_SERVER_VALUES = new Set(['', 'none', '_add_', '__none__']);
     const HUE_EMPTY_SERVER_VALUES = new Set(['', 'none', '_add_', '__none__']);
+    const normalizeKnxServerSelection = (value) => {
+      const normalized = value === undefined || value === null ? '' : String(value).trim();
+      return KNX_EMPTY_SERVER_VALUES.has(normalized.toLowerCase()) ? '' : normalized;
+    };
+    const normalizeHueServerSelection = (value) => {
+      const normalized = value === undefined || value === null ? '' : String(value).trim();
+      return HUE_EMPTY_SERVER_VALUES.has(normalized.toLowerCase()) ? '' : normalized;
+    };
     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
@@ -183,10 +210,20 @@
             outline: 3px solid #fbbf24;
             outline-offset: 2px;
           }
-          #hue-controller-profile-editor.hue-controller-no-knx .hue-knx-section,
           #hue-controller-profile-editor.hue-controller-light-profile.hue-controller-no-knx #tabs {
             display: none !important;
           }
+          #hue-controller-profile-editor:not(.hue-controller-light-profile).hue-controller-no-knx .hue-knx-section {
+            display: none !important;
+          }
+          #hue-controller-profile-editor .hue-controller-knx-flow-only-notice {
+            box-sizing: border-box;
+            padding: 9px 12px;
+            margin: 0 0 12px;
+            border-left: 4px solid #d79b00;
+            background: #fff8df;
+            color: #4d3a00;
+          }
           /* Every profile inherited slightly different fixed KNX widths. Mark
              actual DPT rows after mounting and compact only their DPT/Name
              controls. No wrapping keeps one mapping on one visual line, while the
@@ -299,6 +336,16 @@
         let selectedHueResource;
         let activeHueServerId;
         let hueDevicePickerMouseDown = false;
+        let hueCatalogReady = false;
+        let hueReadinessTimer;
+        let hueUnreachableTimer;
+        let hueReadinessAttempts = 0;
+        let hueReadinessErrorShown = false;
+        let hueBridgeUnreachable = false;
+        let hueEditorClosed = false;
+        const HUE_READINESS_INTERVAL_MS = 2000;
+        const HUE_READINESS_MAX_ATTEMPTS = 60;
+        const HUE_UNREACHABLE_TIMEOUT_MS = 15000;
         const defaultHueDevicePlaceholder = $('#node-input-name').attr('placeholder') || '';
 
         const hasLegacyHueNodes = editorContainsLegacyHueNodes();
@@ -319,6 +366,24 @@
           try { return JSON.parse(JSON.stringify(value)); } catch (error) { return value; }
         };
 
+        // Several profile editors update the live node object while the dialog
+        // is open so switching device functions can mount the correct fields.
+        // Node-RED cannot roll those direct mutations back by itself on Cancel,
+        // therefore retain the complete persisted defaults before editing.
+        const originalEditorState = {};
+        Object.keys(buildDefaults()).forEach((key) => {
+          originalEditorState[key] = {
+            present: Object.prototype.hasOwnProperty.call(controllerNode, key),
+            value: cloneEditorValue(controllerNode[key])
+          };
+        });
+        const restoreOriginalEditorState = () => {
+          Object.entries(originalEditorState).forEach(([key, snapshot]) => {
+            if (snapshot.present) controllerNode[key] = cloneEditorValue(snapshot.value);
+            else delete controllerNode[key];
+          });
+        };
+
         const collectCurrentEditor = () => {
           // Collect before unmounting. Exact keys come from the selected private
           // definition, avoiding broad DOM scans and widget-added CSS classes.
@@ -326,7 +391,13 @@
           const definition = getProfileDefinition(controllerNode.hueControllerType);
           const draft = {};
           Object.keys(definition?.defaults || {}).forEach((key) => {
-            const value = readFieldValue($(`#node-input-${key}`), controllerNode[key]);
+            const fieldValue = readFieldValue($(`#node-input-${key}`), controllerNode[key]);
+            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);
@@ -342,7 +413,7 @@
           // namespaces that belong specifically to this wrapper.
           if (!activeProfile || !legacyContext) return;
           $('#node-input-server').off('.knxUltimateHueControllerLightVisibility');
-          $('#node-input-server').off('.knxUltimateHueControllerKnxVisibility');
+          $(document).off('change.knxUltimateHueControllerKnxVisibility', '#node-input-server');
           const definition = getProfileDefinition(controllerNode.hueControllerType);
           if (definition && typeof definition.oneditcancel === 'function') {
             definition.oneditcancel.call(legacyContext);
@@ -395,7 +466,11 @@
         const getRawHueResourceId = (value) => String(value || '').split('#')[0];
 
         const updateSelectedDevicePresentation = (controllerType = controllerNode.hueControllerType) => {
-          const hasDevice = getHueDeviceValue() !== '';
+          // A persisted device remains visible while its Hue Bridge is offline.
+          // Catalog readiness controls discovery and editing of the device
+          // selection, not whether saved mappings remain usable in the editor.
+          const hueServerSelected = resolveHueServerId({ allowStored: true }) !== '';
+          const hasDevice = hueServerSelected && getHueDeviceValue() !== '';
           const profile = PROFILE_TYPES[controllerType] || PROFILE_TYPES.light;
           const typeLabel = controllerText(`types.${controllerType}`, profile.label);
           $('#hue-controller-selected-device-type-value').text(typeLabel);
@@ -405,6 +480,25 @@
           $('#node-input-hueControllerType').val(controllerType);
         };
 
+        const updateHueDeviceControlVisibility = () => {
+          const hueServerSelected = resolveHueServerId({ allowStored: true }) !== '';
+          const hasPersistedDevice = getHueDeviceValue() !== '';
+          const deviceControlVisible = hueServerSelected && (hueCatalogReady || hasPersistedDevice);
+          const deviceCatalogPending = hueServerSelected && !hueCatalogReady;
+          $('#hue-controller-device-row').toggle(deviceControlVisible);
+          $('#node-input-name').prop('disabled', hueServerSelected && !hueCatalogReady);
+          $('#hue-controller-devices-loading').toggle(deviceCatalogPending);
+          $('#hue-controller-devices-waiting').toggle(!hueBridgeUnreachable);
+          $('#hue-controller-devices-unreachable').toggle(hueBridgeUnreachable);
+          if (!deviceControlVisible) {
+            $('#hue-controller-selected-device-type').hide();
+            $('#hue-controller-locate-device').hide();
+            $('#hue-controller-profile-editor').hide();
+            return;
+          }
+          updateSelectedDevicePresentation();
+        };
+
         const filterHueResources = (term) => {
           const search = String(term || '').replace(/exactmatch/gi, '').trim().toLowerCase();
           return cachedHueResources.filter((item) => {
@@ -441,38 +535,114 @@
           const reply = typeof response === 'function' ? response : () => { };
           const hueServerId = resolveHueServerId({ allowStored: true });
           if (hueServerId === '') {
+            hueCatalogReady = false;
+            updateHueDeviceControlVisibility();
             reply([]);
             return;
           }
           if (!forceRefresh && cachedHueResources.length > 0) {
+            hueCatalogReady = true;
+            updateHueDeviceControlVisibility();
             reply(filterHueResources(term));
             return;
           }
-          $('#hue-controller-devices-loading').show();
           const refreshQuery = forceRefresh ? '&forceRefresh=1' : '';
           $.getJSON(`KNXUltimateGetResourcesHUE?rtype=hue_controller&serverId=${encodeURIComponent(hueServerId)}${refreshQuery}&_=${Date.now()}`, (data) => {
+            if (hueEditorClosed) return;
+            if (resolveHueServerId({ allowStored: true }) !== hueServerId) {
+              reply([]);
+              return;
+            }
             const devices = Array.isArray(data) ? data : (Array.isArray(data?.devices) ? data.devices : []);
             cachedHueResources = devices.filter((item) => item && PROFILE_TYPES[item.controllerType] && item.id && item.hueDevice);
+            hueCatalogReady = data?.ready === true;
             $('#node-input-name').attr('placeholder', cachedHueResources.length > 0
               ? defaultHueDevicePlaceholder
               : controllerText('no_devices', 'No Hue resources found. Check the Hue Bridge and press refresh.'));
-            reconcileSavedHueResource();
+            updateHueDeviceControlVisibility();
+            if (hueCatalogReady) reconcileSavedHueResource();
             reply(filterHueResources(term));
           }).fail(() => {
+            if (hueEditorClosed) return;
             cachedHueResources = [];
+            hueCatalogReady = false;
+            updateHueDeviceControlVisibility();
             $('#node-input-name').attr('placeholder', controllerText('no_devices', 'No Hue resources found. Check the Hue Bridge and press refresh.'));
             reply([]);
-          }).always(() => {
-            $('#hue-controller-devices-loading').hide();
           });
         };
 
+        const clearHueReadinessTimer = () => {
+          if (hueReadinessTimer !== undefined) clearTimeout(hueReadinessTimer);
+          hueReadinessTimer = undefined;
+        };
+
+        const clearHueUnreachableTimer = () => {
+          if (hueUnreachableTimer !== undefined) clearTimeout(hueUnreachableTimer);
+          hueUnreachableTimer = undefined;
+        };
+
+        const probeHueBridgeReadiness = ({ reset = false, openPicker = false } = {}) => {
+          clearHueReadinessTimer();
+          if (reset) {
+            hueReadinessAttempts = 0;
+            hueReadinessErrorShown = false;
+            hueBridgeUnreachable = false;
+            clearHueUnreachableTimer();
+          }
+          const expectedServerId = resolveHueServerId({ allowStored: true });
+          if (expectedServerId === '') {
+            clearHueUnreachableTimer();
+            hueCatalogReady = false;
+            updateHueDeviceControlVisibility();
+            return;
+          }
+          if (reset) {
+            hueUnreachableTimer = setTimeout(() => {
+              if (hueEditorClosed) return;
+              if (resolveHueServerId({ allowStored: true }) !== expectedServerId || hueCatalogReady) return;
+              hueBridgeUnreachable = true;
+              updateHueDeviceControlVisibility();
+            }, HUE_UNREACHABLE_TIMEOUT_MS);
+          }
+          updateHueDeviceControlVisibility();
+          hueReadinessAttempts += 1;
+          fetchHueResources('', (items) => {
+            if (resolveHueServerId({ allowStored: true }) !== expectedServerId) return;
+            if (hueCatalogReady) {
+              clearHueUnreachableTimer();
+              hueBridgeUnreachable = false;
+              updateHueDeviceControlVisibility();
+              if (openPicker && items.length) $('#node-input-name').autocomplete('search', '');
+              return;
+            }
+            if (hueReadinessAttempts >= HUE_READINESS_MAX_ATTEMPTS) {
+              if (!hueReadinessErrorShown) {
+                hueReadinessErrorShown = true;
+                updateHueDeviceControlVisibility();
+                RED.notify(controllerText(
+                  'hue_bridge_not_ready',
+                  'The Hue Bridge did not become ready. Check its connection and reopen the editor.'
+                ), { type: 'error', fixed: true });
+              }
+              return;
+            }
+            hueReadinessTimer = setTimeout(() => {
+              probeHueBridgeReadiness({ openPicker });
+            }, HUE_READINESS_INTERVAL_MS);
+          }, { forceRefresh: true });
+        };
+
         const configureUnifiedDeviceControl = () => {
           const $deviceName = $('#node-input-name');
           if (!$deviceName.length) return;
           $deviceName.autocomplete({
             minLength: 0,
             source(request, response) {
+              if (!hueCatalogReady) {
+                response([]);
+                return;
+              }
               fetchHueResources(request.term, response);
             },
             select(event, ui) {
@@ -615,6 +785,16 @@
           // out of the embedded editor makes every device profile more compact.
           $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';
+            const translatedNotice = RED._(noticeKey);
+            if (translatedNotice && translatedNotice !== noticeKey) knxFlowOnlyNoticeText = translatedNotice;
+          } catch (error) { /* use English fallback */ }
+          $knxFlowOnlyNotice.text(knxFlowOnlyNoticeText);
+
           const updateControllerKnxVisibility = () => {
             // Node-RED has used several sentinel values for an empty config-node
             // selector. During editor bootstrap the DOM can temporarily expose
@@ -631,11 +811,39 @@
             const hasStoredServer = !KNX_EMPTY_SERVER_VALUES.has(storedServerValue);
             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 (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 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();
           };
           updateControllerKnxVisibility();
-          $('#node-input-server')
-            .off('.knxUltimateHueControllerKnxVisibility')
-            .on('change.knxUltimateHueControllerKnxVisibility', updateControllerKnxVisibility);
+          $(document)
+            .off('change.knxUltimateHueControllerKnxVisibility', '#node-input-server')
+            .on('change.knxUltimateHueControllerKnxVisibility', '#node-input-server', handleControllerKnxSelection);
           updateSelectedDevicePresentation(controllerType);
           focusProfileHelp(controllerType);
         };
@@ -648,34 +856,55 @@
           .off('.knxUltimateHueControllerDevice')
           .on('click.knxUltimateHueControllerDevice', () => {
             cachedHueResources = [];
-            fetchHueResources('', (items) => {
-              if (items.length) $('#node-input-name').autocomplete('search', '');
-            }, { forceRefresh: true });
+            hueCatalogReady = false;
+            probeHueBridgeReadiness({ reset: true, openPicker: true });
           });
-        $('#node-input-serverHue')
-          .off('.knxUltimateHueControllerDevice')
-          .on('change.knxUltimateHueControllerDevice', () => {
-            const nextServerId = resolveHueServerId();
+        $(document)
+          .off('change.knxUltimateHueControllerHueServer', '#node-input-serverHue')
+          .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;
+            if (legacyContext) legacyContext.serverHue = nextServerId;
+            clearHueReadinessTimer();
+            clearHueUnreachableTimer();
             cachedHueResources = [];
+            hueCatalogReady = false;
+            hueReadinessErrorShown = false;
+            hueBridgeUnreachable = false;
             selectedHueResource = undefined;
             controllerNode.name = '';
             controllerNode.hueDevice = '';
             $('#node-input-name, #node-input-hueDevice').val('');
+            updateHueDeviceControlVisibility();
             updateSelectedDevicePresentation();
+            if (nextServerId !== '') probeHueBridgeReadiness({ reset: true });
           });
 
         this._hueControllerCollectEditor = collectCurrentEditor;
         this._hueControllerGetLegacyContext = () => legacyContext;
         this._hueControllerGetProfile = () => activeProfile;
         this._hueControllerCloseMigration = () => closeMigrationDialog();
+        this._hueControllerRestoreOriginalState = restoreOriginalEditorState;
         this._hueControllerCleanupDevice = () => {
+          hueEditorClosed = true;
+          clearHueReadinessTimer();
+          clearHueUnreachableTimer();
           $('#hue-controller-refresh-devices, #node-input-serverHue, #node-input-name').off('.knxUltimateHueControllerDevice');
+          $(document).off('change.knxUltimateHueControllerHueServer', '#node-input-serverHue');
+          $(document).off('change.knxUltimateHueControllerKnxVisibility', '#node-input-server');
           delete controllerNode.__configureHueControllerDeviceControl;
         };
         renderProfileEditor(selectedType);
-        fetchHueResources('', () => { });
+        updateHueDeviceControlVisibility();
+        probeHueBridgeReadiness({ reset: true });
       },
       oneditsave() {
         // Preserve lifecycle order: close auxiliary UI, collect mounted fields,
@@ -705,11 +934,12 @@
         delete this._hueControllerGetLegacyContext;
         delete this._hueControllerGetProfile;
         delete this._hueControllerCloseMigration;
+        delete this._hueControllerRestoreOriginalState;
         delete this._hueControllerCleanupDevice;
       },
       oneditcancel() {
-        // Cancel releases profile-owned editor state but deliberately does not
-        // collect or persist the values currently visible in the dialog.
+        // Cancel releases profile-owned editor state and restores the snapshot
+        // taken before device/profile previews mutated the live node object.
         if (typeof this._hueControllerCloseMigration === 'function') this._hueControllerCloseMigration();
         const profile = typeof this._hueControllerGetProfile === 'function'
           ? this._hueControllerGetProfile()
@@ -722,7 +952,12 @@
           definition.oneditcancel.call(legacyContext || this);
         }
         if (typeof this._hueControllerCleanupDevice === 'function') this._hueControllerCleanupDevice();
+        if (typeof this._hueControllerRestoreOriginalState === 'function') this._hueControllerRestoreOriginalState();
+        delete this._hueControllerCollectEditor;
+        delete this._hueControllerGetLegacyContext;
+        delete this._hueControllerGetProfile;
         delete this._hueControllerCloseMigration;
+        delete this._hueControllerRestoreOriginalState;
         delete this._hueControllerCleanupDevice;
       }
     });
@@ -759,11 +994,18 @@
     </label>
     <input type="text" id="node-input-serverHue">
   </div>
-  <br />
-  <p>
-    <b><span data-i18n="knxUltimateHueController.hue_section"></span></b>
-  </p>
-  <div class="form-row" id="hue-controller-device-row">
+  <div class="form-row" id="hue-controller-devices-loading" style="display:none; color:#666;">
+    <label></label>
+    <span id="hue-controller-devices-waiting">
+      <i class="fa fa-circle-notch fa-spin" style="color:#1b7d33;"></i>
+      <span data-i18n="knxUltimateHueController.loading_hue_devices"></span>
+    </span>
+    <span id="hue-controller-devices-unreachable" style="display:none; color:#b45309;">
+      <i class="fa fa-exclamation-triangle"></i>
+      <span data-i18n="knxUltimateHueController.hue_bridge_unreachable"></span>
+    </span>
+  </div>
+  <div class="form-row" id="hue-controller-device-row" style="display:none;">
     <label for="node-input-name">
       <i class="fa fa-play-circle"></i>
       <span data-i18n="knxUltimateHueController.hue_device"></span>
@@ -778,9 +1020,6 @@
       style="display:none; margin-left:6px; color:#ff9800; border-color:#ff9800;" data-i18n="[title]knxUltimateHueController.locate_device">
       <i class="fa fa-play"></i>
     </button>
-    <span id="hue-controller-devices-loading" style="margin-left:6px; display:none; color:#1b7d33;">
-      <i class="fa fa-circle-notch fa-spin"></i>
-    </span>
     <span id="hue-controller-selected-device-type" style="display:none; margin-left:10px; color:#666; white-space:nowrap;">
       <i class="fa fa-cubes"></i>
       <span data-i18n="knxUltimateHueController.device_type"></span>:
@@ -789,7 +1028,6 @@
     <input type="hidden" id="node-input-hueDevice">
     <input type="hidden" id="node-input-hueControllerType">
   </div>
-  <br />
   <div id="hue-controller-profile-editor"></div>
   <br/>
    <br/>
@@ -806,6 +1044,12 @@ The unified controller for Hue API v2 resources. Choose a Hue device or resource
 
 Clicking or focusing the Hue device field always opens the complete resource list, even when a device is already selected. Typing continues to filter the list.
 
+The Hue device picker remains hidden until the selected Hue Bridge is connected and its resource catalog is ready. A loading indicator is shown while the editor waits; selecting `none` hides the indicator and device controls.
+
+If the node already has a saved Hue device, its picker and KNX mapping tabs remain available while the selected bridge is offline. Resource discovery continues in the background and a fixed red error appears if the bridge does not become ready.
+
+For Light resources without a KNX gateway, the editor shows a flow-only notice in place of the duplicate “Philips HUE” heading.
+
 The controller supports lights and grouped lights, plugs, buttons, Tap dial, motion resources, contacts, light level, temperature, humidity, scenes, battery, Zigbee connectivity, and device software update resources.
 
 ## Convert a legacy HUE flow
@@ -822,7 +1066,11 @@ Each function uses its private mature runtime contract. Hue events remain status
 
 Dedicated legacy HUE nodes remain registered for existing flows, but are frozen and receive no new features or maintenance updates. Node-RED hides their special `deprecated` category from the palette, while existing instances remain editable, deployable, lighter than HUE Controller and visibly marked `(deprecated)` on the canvas. They also show a migration notice at the top of their editor. Before starting, [watch the explanatory migration video on YouTube](https://youtu.be/f0Evf2QFI7c). Use HUE Controller for new work or migrate them with the fully local conversion button; afterwards, the browser opens only an editable usage email draft without navigating away from Node-RED. The email is never sent automatically. Before Deploy, inspect every modified HUE node and verify its function, configuration references, pins and wiring. A fixed Node-RED completion message remains visible until you click **OK** and offers an optional support button; the donation page opens only when that button is clicked.
 
-When no **KNX Gateway** is selected (including **none** and **Add new...**), the KNX mapping fields are hidden. Hue resource selection and flow-only options remain available.
+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

@@ -4,9 +4,14 @@
 <p>Wählen Sie ein Hue-Gerät oder eine Hue-Ressource. HUE Controller erkennt den Gerätetyp automatisch und öffnet den passenden Editor für KNX-Zuordnungen, Verhalten und Node-Anschlüsse.</p>
 <p>Geräteauswahl, Aktualisierung und erkannter Typ stehen wie beim Matter Controller in derselben kompakten Zeile.</p>
 <p>Ein Klick oder Fokus auf das Gerätefeld öffnet immer die vollständige Hue-Ressourcenliste, auch wenn bereits ein Gerät ausgewählt ist. Beim Tippen wird die Liste weiterhin gefiltert.</p>
+<p>Die Auswahl einer anderen Hue-Ressource ist nur eine Vorschau, bis der Editor gespeichert wird. Mit <code>Abbrechen</code> werden das zuvor gespeicherte Gerät, die Funktion und die Zuordnungen wiederhergestellt.</p>
+<p>Die Hue-Geräteauswahl bleibt ausgeblendet, bis eine Hue Bridge ausgewählt und verbunden ist und ihren Ressourcenkatalog geladen hat. Während der Wartezeit wird eine Ladeanzeige angezeigt. Wird die Bridge-Auswahl auf <code>none</code> zurückgesetzt, werden Ladeanzeige, Geräteauswahl und Geräteeditor wieder ausgeblendet.</p>
+<p>Wenn im Knoten bereits ein Hue-Gerät gespeichert ist, bleibt dessen Auswahl sichtbar, aber deaktiviert, während die ausgewählte Bridge offline ist; die KNX-Zuordnungsregister bleiben verfügbar. Nach 15 Sekunden meldet die Warteanzeige, dass die Hue Bridge nicht erreichbar ist. Die Ressourcensuche läuft im Hintergrund weiter; wird die Bridge nicht bereit, erscheint schließlich eine feste rote Fehlermeldung.</p>
 <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 KNX-Zuordnungsfelder ausgeblendet; die Auswahl der Hue-Ressource und reine Flow-Optionen bleiben verfügbar.</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>
 <p>Locate und der Leuchten-Zuordnungsbereich werden vor den optionalen Effekt- und Register-Widgets initialisiert. Ein gespeichertes KNX-Gateway bleibt gültig, wenn Node-RED beim Start des Editors vorübergehend einen leeren Selektor anzeigt. Browserseitige Fehler und ein abgewiesener erster Locate-Befehl erzeugen eine feste rote Node-RED-Fehlermeldung mit dem technischen Detail, statt den Editor still zu lassen.</p>
@@ -42,6 +47,8 @@
 
 <p>Dieser Node steuert HUE-Leuchten (einzeln oder gruppiert) und ordnet Befehle/Zustände KNX-Gruppenadressen zu.</p>
 
+<p>Ohne KNX-Gateway erscheint anstelle der doppelten Überschrift „Philips HUE“ ein Hinweis zur reinen Flow-Nutzung.</p>
+
 <p><strong>Leuchtengruppen:</strong> wenn ein KNX-Gateway konfiguriert ist, zeigt die Auswahl eines <code>grouped_light</code> immer die vollständigen Zuordnungen für Schalten, Dimmen, Tunable White, RGB/HSV, Effekte und Verhalten. Der Editor schränkt diese Felder nicht anhand der aktuell enthaltenen Leuchten ein.</p>
 
 **Allgemein**

package/nodes/locales/de/knxUltimateHueController.json

@@ -5,13 +5,16 @@
   },
   "knxUltimateHueController": {
     "device_function": "Gerätefunktion",
-    "hue_section": "Philips Hue",
     "hue_device": "Hue-Gerät",
     "hue_device_placeholder": "Hue-Gerät oder -Ressource suchen",
+    "loading_hue_devices": "Verbindung zur Hue Bridge wird hergestellt und Geräte werden geladen…",
+    "hue_bridge_unreachable": "Die Hue Bridge ist nicht erreichbar.",
     "device_type": "Gerätetyp",
     "refresh_devices": "Hue-Geräte aktualisieren",
     "locate_device": "Ausgewählte Hue-Leuchte lokalisieren",
     "no_devices": "Keine Hue-Ressourcen gefunden. Prüfen Sie die Hue Bridge und aktualisieren Sie die Liste.",
+    "hue_bridge_not_ready": "Die Hue Bridge wurde nicht bereit. Prüfen Sie die Verbindung und öffnen Sie den Editor erneut.",
+    "knx_gateway_required_for_mappings": "Wählen Sie ein KNX-Gateway aus, um die Gruppenadress-Zuordnungen anzuzeigen. Ohne Gateway kann dieser Knoten nur über Eingangsnachrichten aus dem Flow gesteuert werden.",
     "legacy_node_notice": "Dieser Legacy-HUE-Knoten ist veraltet. Verwenden Sie für neue Flows den neuen HUE Controller-Knoten.",
     "migration_button": "Legacy-HUE-Knoten konvertieren",
     "migration_button_title": "Alle Legacy-HUE-Knoten im Editor konvertieren",

package/nodes/locales/en/knxUltimateHueController.html

@@ -4,9 +4,14 @@
 <p>Select a Hue device or resource. HUE Controller detects its device type automatically and opens the matching KNX mapping, behaviour and node-pin editor.</p>
 <p>The device picker, refresh action and detected type share the same compact row, matching the Matter Controller workflow.</p>
 <p>Clicking or focusing the device field always opens the complete Hue resource list, even when a device is already selected. Typing continues to filter the list.</p>
+<p>Selecting another Hue resource is only a preview until the editor is saved. Pressing <code>Cancel</code> restores the previously saved device, function and mappings.</p>
+<p>The Hue device picker remains hidden until a Hue Bridge is selected, connected, and has loaded its resource catalog. A loading indicator is shown while waiting. Returning the bridge selector to <code>none</code> hides the indicator, picker and device editor again.</p>
+<p>If the node already has a saved Hue device, its picker remains visible but disabled while the selected bridge is offline, and its KNX mapping tabs remain available. After 15 seconds the loading label reports that the Hue Bridge is not reachable. Resource discovery continues in the background and a fixed red error eventually appears if the bridge does not become ready.</p>
 <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>), KNX mapping fields are hidden while Hue resource selection and flow-only options remain available.</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>
 <p>Locate and the Light mapping container initialize before optional Effects and tab widgets. A saved KNX gateway remains valid if Node-RED temporarily exposes an empty selector while the editor starts. Browser-side failures and a rejected initial Locate command produce a fixed red Node-RED error with the technical detail instead of leaving the editor silent.</p>
@@ -42,6 +47,8 @@
 
 <p>This node controls Philips Hue lights (single or grouped) and maps their commands/states to KNX.</p>
 
+<p>Without a KNX gateway, the editor shows a flow-only notice in place of the duplicate “Philips HUE” heading.</p>
+
 <p><strong>Grouped lights:</strong> when a KNX gateway is configured, selecting a <code>grouped_light</code> always displays the complete Switch, Dim, Tunable White, RGB/HSV, Effects and Behaviour mappings. The editor does not restrict these fields according to the group's current child lights.</p>
 
 **General**