iobroker.eos-admin 7.9.36 → 7.9.38

package/adminWww/css/eos-branding.css

@@ -3321,7 +3321,7 @@ html.eos-app #eos-assist-root {
 }
 
 
-/* === NexoWatt EOS v36: native adapter configuration safe mode =============
+/* === NexoWatt EOS v38: native adapter configuration safe mode =============
    Custom adapter configuration pages (React/HTML/jsonConfig) must be fully
    controlled by the adapter itself. EOS shell decoration is disabled inside the
    content area so buttons such as "Gerät hinzufügen" and "Gerät bearbeiten" stay
@@ -3371,3 +3371,84 @@ html.eos-app.eos-adapter-config-surface #app-paper .eos-protected-adapter-row {
     filter: none !important;
     pointer-events: auto !important;
 }
+
+
+/* === NexoWatt EOS v38: native popup/dialog compatibility ==================
+   EOS decoration must never block native Admin dialogs, adapter install search,
+   autocomplete poppers, menus or adapter-owned configuration dialogs. */
+html.eos-app .MuiDialog-root,
+html.eos-app .MuiModal-root,
+html.eos-app .MuiPopover-root,
+html.eos-app .MuiPopper-root,
+html.eos-app .MuiMenu-root,
+html.eos-app .MuiAutocomplete-popper,
+html.eos-app [role="dialog"],
+html.eos-app [role="listbox"],
+html.eos-app [role="menu"] {
+    pointer-events: auto !important;
+}
+html.eos-app .MuiDialog-paper,
+html.eos-app .MuiPaper-root[role="dialog"],
+html.eos-app .MuiPopover-paper,
+html.eos-app .MuiMenu-paper,
+html.eos-app .MuiAutocomplete-paper,
+html.eos-app .MuiAutocomplete-listbox,
+html.eos-app .MuiList-root[role="listbox"] {
+    pointer-events: auto !important;
+    user-select: auto !important;
+}
+html.eos-app .MuiAutocomplete-popper,
+html.eos-app .MuiPopper-root,
+html.eos-app .MuiPopover-root,
+html.eos-app .MuiMenu-root {
+    z-index: 6500 !important;
+}
+html.eos-app .MuiDialog-root button,
+html.eos-app .MuiDialog-root [role="button"],
+html.eos-app .MuiDialog-root a,
+html.eos-app .MuiModal-root button,
+html.eos-app .MuiModal-root [role="button"],
+html.eos-app .MuiModal-root a,
+html.eos-app .MuiPopover-root button,
+html.eos-app .MuiPopover-root [role="button"],
+html.eos-app .MuiPopover-root a,
+html.eos-app .MuiPopper-root button,
+html.eos-app .MuiPopper-root [role="button"],
+html.eos-app .MuiPopper-root a,
+html.eos-app .MuiMenu-root button,
+html.eos-app .MuiMenu-root [role="button"],
+html.eos-app .MuiMenu-root a,
+html.eos-app [role="listbox"] [role="option"],
+html.eos-app .MuiAutocomplete-option {
+    pointer-events: auto !important;
+    visibility: visible !important;
+}
+
+/* v38: snackbars/toasts are clickable, but generic dialogs are not modified. */
+html.eos-app .MuiSnackbar-root,
+html.eos-app .SnackbarItem-root,
+html.eos-app .SnackbarItem-wrappedRoot,
+html.eos-app .notistack-Snackbar,
+html.eos-app .Toastify__toast-container,
+html.eos-app .Toastify__toast {
+    pointer-events: auto !important;
+    z-index: 5200 !important;
+}
+html.eos-app .MuiSnackbar-root button,
+html.eos-app .SnackbarItem-root button,
+html.eos-app .notistack-Snackbar button,
+html.eos-app .Toastify__toast button {
+    pointer-events: auto !important;
+    visibility: visible !important;
+    opacity: 1 !important;
+}
+
+/* v38: never allow decorative EOS layers to sit above native modals/popups. */
+html.eos-app .eos-top-toolbar::before,
+html.eos-app .eos-top-toolbar::after,
+html.eos-app .eos-brand-badge::before,
+html.eos-app .eos-brand-badge::after,
+html.eos-app .eos-panel::before,
+html.eos-app .eos-panel::after {
+    pointer-events: none !important;
+}

package/adminWww/index.html

@@ -31,7 +31,7 @@
             rel="stylesheet"
             href="css/leaflet.css"
         />
-        <link rel="stylesheet" href="./css/eos-branding.css?v=36" />
+        <link rel="stylesheet" href="./css/eos-branding.css?v=38" />
         <link
             rel="manifest"
             href="manifest.json"
@@ -154,9 +154,9 @@
       <script type="module" crossorigin src="./assets/index-CQZugZ1z.js"></script>
       <link rel="modulepreload" crossorigin href="./assets/preload-helper-BDBacUwf.js">
       <link rel="modulepreload" crossorigin href="./assets/iobroker_admin__mf_v__runtimeInit__mf_v__-g2X2zhAf.js">
-            <script defer src="./js/eos-branding.js?v=36"></script>
-            <script defer src="./js/eos-security-ui.js?v=36"></script>
-            <script defer src="./js/eos-assistant.js?v=36"></script>
+            <script defer src="./js/eos-branding.js?v=38"></script>
+            <script defer src="./js/eos-security-ui.js?v=38"></script>
+            <script defer src="./js/eos-assistant.js?v=38"></script>
     </head>
     <body>
         <noscript>You need to enable JavaScript to run this app.</noscript>

package/adminWww/js/eos-branding.js

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
 
-    window.NEXOWATT_EOS_UI_VERSION = 'v36-native-config-session-fix';
+    window.NEXOWATT_EOS_UI_VERSION = 'v38-popup-config-stability-fix';
 
     const BRAND = 'NexoWatt EOS';
     const EOS_MEANING = 'Energy Operation System';
@@ -48,6 +48,46 @@
         'ß': 'ß', 'Ä': 'Ä', 'Ö': 'Ö', 'Ãœ': 'Ü', 'ä': 'ä', 'ö': 'ö', 'ü': 'ü'
     }));
 
+
+
+    const decodeMojibakeChunk = chunk => {
+        try {
+            const bytes = Uint8Array.from(Array.from(chunk, char => char.charCodeAt(0) & 0xff));
+            const decoded = new TextDecoder('utf-8', { fatal: false }).decode(bytes);
+            return decoded && decoded !== chunk ? decoded : chunk;
+        } catch (_) {
+            return chunk;
+        }
+    };
+
+    const repairMojibake = value => {
+        let text = String(value || '');
+        // Repair common UTF-8-as-Latin1 fragments, including double-encoded strings
+        // such as dürfen, Löschen, geschützt.
+        for (let i = 0; i < 3 && /(?:Ã.|Â.|â.|�)/.test(text); i += 1) {
+            const repaired = text.replace(/[\u00C2-\u00F4][\u0080-\u00BF\u00A0-\u00BF]+/g, decodeMojibakeChunk);
+            if (repaired === text) break;
+            text = repaired;
+        }
+        const hardMap = new Map(Object.entries({
+            'dürfen': 'dürfen', 'dürfen': 'dürfen', 'Dürfen': 'Dürfen', 'Dürfen': 'Dürfen',
+            'für': 'für', 'für': 'für', 'Für': 'Für', 'Für': 'Für',
+            'können': 'können', 'können': 'können', 'Können': 'Können', 'Können': 'Können',
+            'möglich': 'möglich', 'möglich': 'möglich', 'Möglich': 'Möglich', 'Möglich': 'Möglich',
+            'Löschen': 'Löschen', 'Löschen': 'Löschen', 'löschen': 'löschen', 'löschen': 'löschen',
+            'schützen': 'schützen', 'schützen': 'schützen', 'Schützen': 'Schützen', 'Schützen': 'Schützen',
+            'Geschützte': 'Geschützte', 'Geschützte': 'Geschützte', 'geschützte': 'geschützte', 'geschützte': 'geschützte',
+            'ausgewählte': 'ausgewählte', 'ausgewählte': 'ausgewählte', 'Ausgewählte': 'Ausgewählte', 'Ausgewählte': 'Ausgewählte',
+            'ändern': 'ändern', 'ändern': 'ändern', 'Ãœber': 'Über', 'Ãœber': 'Über', 'über': 'über', 'über': 'über',
+            'Gerät': 'Gerät', 'Gerät': 'Gerät', 'Geräte': 'Geräte', 'Geräte': 'Geräte',
+            'schließen': 'schließen', 'schließen': 'schließen', 'ß': 'ß', 'ß': 'ß',
+            'ä': 'ä', 'ä': 'ä', 'ö': 'ö', 'ö': 'ö', 'ü': 'ü', 'ü': 'ü',
+            'Ä': 'Ä', 'Ä': 'Ä', 'Ö': 'Ö', 'Ö': 'Ö', 'Ãœ': 'Ü', 'Ãœ': 'Ü', ' ': ' ', 'Â': ''
+        }));
+        for (const [from, to] of hardMap) if (text.includes(from)) text = text.split(from).join(to);
+        return text;
+    };
+
     const EXACT_LABELS = new Map(Object.entries({
         'Admin': BRAND,
         'NEXOWATT': 'NEXOWATT EOS',
@@ -104,11 +144,13 @@
 
     const replaceBrand = value => {
         if (!value || typeof value !== 'string') return value;
-        let next = value;
+        let next = repairMojibake(value);
         for (const [from, to] of MOJIBAKE_REPLACEMENTS) {
             if (next.includes(from)) next = next.split(from).join(to);
         }
+        next = repairMojibake(next);
         for (const [pattern, replacement] of TEXT_REPLACEMENTS) next = next.replace(pattern, replacement);
+        next = repairMojibake(next);
         const compact = next.trim();
         if (EXACT_LABELS.has(compact)) next = next.replace(compact, EXACT_LABELS.get(compact));
         return next;
@@ -145,6 +187,32 @@
         while ((node = walker.nextNode())) patchTextNode(node);
     });
 
+
+    const patchMojibakeTextNode = node => {
+        if (!node || node.nodeType !== Node.TEXT_NODE || !node.nodeValue) return;
+        if (skipElement(node.parentElement)) return;
+        const before = node.nodeValue;
+        const after = repairMojibake(before);
+        if (after !== before) node.nodeValue = after;
+    };
+
+    const patchMojibakeTextNodes = root => safe(() => {
+        if (!root) return;
+        if (root.nodeType === Node.TEXT_NODE) {
+            patchMojibakeTextNode(root);
+            return;
+        }
+        if (root.nodeType !== Node.ELEMENT_NODE && root.nodeType !== Node.DOCUMENT_NODE) return;
+        if (skipElement(root)) return;
+        const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT, {
+            acceptNode(node) {
+                return skipElement(node.parentElement) ? NodeFilter.FILTER_REJECT : NodeFilter.FILTER_ACCEPT;
+            }
+        });
+        let node;
+        while ((node = walker.nextNode())) patchMojibakeTextNode(node);
+    });
+
     const patchImage = img => {
         const src = img.getAttribute('src') || '';
         const alt = img.getAttribute('alt') || '';
@@ -335,6 +403,52 @@
         });
     };
 
+
+    const releaseNotificationControls = () => safe(() => {
+        // v38: Keep native snackbar/toast close buttons clickable without touching dialogs,
+        // poppers, menus or adapter-owned configuration surfaces. Earlier broad selectors
+        // changed generic dialogs and broke React click handlers.
+        const roots = [
+            '.MuiSnackbar-root',
+            '.SnackbarItem-root',
+            '.SnackbarItem-wrappedRoot',
+            '.notistack-Snackbar',
+            '.Toastify__toast-container',
+            '.Toastify__toast'
+        ].join(',');
+        document.querySelectorAll(roots).forEach(box => {
+            if (box.closest('.MuiDialog-root,.MuiModal-root,.MuiPopover-root,.MuiPopper-root,.MuiMenu-root,[role="dialog"]')) return;
+            box.classList.add('eos-notification-safe');
+            box.style.pointerEvents = 'auto';
+            box.querySelectorAll('button, [role="button"], a, .MuiIconButton-root').forEach(control => {
+                control.classList.remove('eos-protected-delete-control', 'eos-security-hidden-delete');
+                // Do not remove disabled states globally. Only restore pointer handling.
+                control.style.pointerEvents = 'auto';
+                control.style.visibility = '';
+                control.style.opacity = '';
+            });
+        });
+    });
+
+    const ensurePopupCompatibility = () => safe(() => {
+        // v38: All native Admin dialogs, adapter install/autocomplete poppers, menus and
+        // adapter-owned modals must stay above EOS decorative layers and keep their React
+        // event handlers untouched.
+        const selectors = [
+            '.MuiDialog-root', '.MuiModal-root', '.MuiPopover-root', '.MuiPopper-root',
+            '.MuiMenu-root', '.MuiAutocomplete-popper', '.MuiAutocomplete-listbox',
+            '[role="dialog"]', '[role="listbox"]', '[role="menu"]'
+        ].join(',');
+        document.querySelectorAll(selectors).forEach(el => {
+            el.classList.add('eos-native-popup-safe');
+            if (el.style) {
+                el.style.pointerEvents = 'auto';
+                const isFloating = el.matches('.MuiPopover-root,.MuiPopper-root,.MuiMenu-root,.MuiAutocomplete-popper,[role="listbox"],[role="menu"]');
+                if (isFloating && !el.closest('.MuiDialog-paper')) el.style.zIndex = '6500';
+            }
+        });
+    });
+
     const protectDeleteDialogs = () => {
         if (isAdminUser() || state.securityPolicy.restrictProtectedAdapterControls === false) return;
         const protectedAdapters = state.securityPolicy.protectedAdapters || [];
@@ -398,6 +512,7 @@
     const applySecurityUiGuard = () => safe(() => {
         const policy = state.securityPolicy;
         applySecurityClasses();
+        releaseNotificationControls();
         // Do not apply EOS security decoration inside native adapter configuration pages.
         // Adapter UIs must remain 100% functional; backend/role checks still protect EOS actions.
         if (isAdapterConfigSurface()) return;
@@ -747,6 +862,8 @@
         }
         patchDrawerHeader(document.querySelector('.MuiDrawer-paper'));
         hideNativeLogoutNav();
+        releaseNotificationControls();
+        ensurePopupCompatibility();
         removeLogoutButton();
     });
 
@@ -867,6 +984,26 @@
     });
 
 
+    
+
+    const ensureNotificationDialogClasses = () => safe(() => {
+        document.querySelectorAll('.MuiDialog-root, .MuiModal-root, [role="presentation"]').forEach(root => {
+            const paper = root.querySelector?.('.MuiDialog-paper, [role="dialog"]');
+            if (!paper) return;
+            const txt = normalize(paper.textContent || '');
+            if (!/(benachrichtigungen|notifications|acknowledge|bestätigen|schließen|close)/i.test(txt) && !paper.querySelector('#notifications-dialog-close')) return;
+            root.classList.add('eos-notification-dialog-root');
+            paper.classList.add('eos-notification-dialog');
+            paper.querySelectorAll('button, [role="button"], a, .MuiButtonBase-root, .MuiIconButton-root').forEach(control => {
+                control.style.pointerEvents = 'auto';
+                control.style.userSelect = 'auto';
+                if (control.getAttribute('aria-disabled') === 'true' && /schließen|close/i.test(control.textContent || control.getAttribute('aria-label') || control.getAttribute('title') || '')) {
+                    control.removeAttribute('aria-disabled');
+                }
+            });
+        });
+    });
+
     const ensureSettingsDialogClasses = () => safe(() => {
         const dialogs = Array.from(document.querySelectorAll('.MuiDialog-paper, [role="dialog"]'));
         dialogs.forEach(dialog => {
@@ -920,6 +1057,15 @@
     });
 
 
+
+
+    const patchNotifications = () => safe(() => {
+        // Kept for compatibility with older calls. v38 intentionally scopes this to
+        // snackbar/toast surfaces only; no dialogs, popovers or adapter config controls.
+        releaseNotificationControls();
+        ensurePopupCompatibility();
+    });
+
     const applyNavCompactPreference = () => safe(() => {
         const compact = localStorage.getItem('nexowatt:eosNavCompact') === '1';
         document.documentElement.classList.toggle('eos-nav-compact', compact);
@@ -1223,10 +1369,18 @@
         ensureRightsHelper();
         ensurePermissionPresets();
         ensureSettingsDialogClasses();
+        ensurePopupCompatibility();
         hideNativeLogoutNav();
         hideOfficialNexoWattRepoWarning();
+        releaseNotificationControls();
+        ensurePopupCompatibility();
         applySecurityUiGuard();
         if (isAdapterConfigSurface()) {
+            // Adapter-owned configuration pages must not be rebranded or structurally patched.
+            // We still repair broken UTF-8/mojibake text because jsonConfig labels can be
+            // rendered through different legacy paths. This is text-only and does not touch
+            // adapter controls, React state, events or attributes.
+            patchMojibakeTextNodes(document.getElementById('app-paper'));
             ['.MuiAppBar-root', '.MuiDrawer-paper', 'nav', '.eos-brand-badge', '.eos-top-toolbar'].forEach(selector => {
                 document.querySelectorAll(selector).forEach(scope => {
                     patchTextNodes(scope);
@@ -1255,12 +1409,18 @@
         ensureRightsHelper();
         ensurePermissionPresets();
         ensureSettingsDialogClasses();
+        ensurePopupCompatibility();
         hideNativeLogoutNav();
         hideOfficialNexoWattRepoWarning();
+        releaseNotificationControls();
+        ensurePopupCompatibility();
         applySecurityUiGuard();
         for (const scope of scopes.slice(0, 80)) {
             if (!scope || !scope.isConnected) continue;
-            if (isAdapterConfigSurface() && (scope.id === 'app-paper' || scope.closest?.('#app-paper'))) continue;
+            if (isAdapterConfigSurface() && (scope.id === 'app-paper' || scope.closest?.('#app-paper'))) {
+                patchMojibakeTextNodes(scope);
+                continue;
+            }
             patchTextNodes(scope);
             patchAttributes(scope);
         }
@@ -1291,14 +1451,17 @@
         const observer = new MutationObserver(mutations => {
             for (const mutation of mutations) {
                 if (mutation.type === 'characterData') {
-                    patchTextNode(mutation.target);
+                    if (isAdapterConfigSurface() && mutation.target?.parentElement?.closest?.('#app-paper')) patchMojibakeTextNode(mutation.target);
+                    else patchTextNode(mutation.target);
                     continue;
                 }
                 if (mutation.type !== 'childList') continue;
                 mutation.addedNodes.forEach(node => {
                     if (!node) return;
-                    if (node.nodeType === Node.TEXT_NODE) patchTextNode(node);
-                    else if (node.nodeType === Node.ELEMENT_NODE) state.pendingScopes.add(node);
+                    if (node.nodeType === Node.TEXT_NODE) {
+                        if (isAdapterConfigSurface() && node.parentElement?.closest?.('#app-paper')) patchMojibakeTextNode(node);
+                        else patchTextNode(node);
+                    } else if (node.nodeType === Node.ELEMENT_NODE) state.pendingScopes.add(node);
                 });
             }
             if (state.pendingScopes.size) scheduleScopePatch();

package/adminWww/js/eos-runtime-fixes.js

@@ -0,0 +1,144 @@
+(() => {
+    'use strict';
+
+    window.NEXOWATT_EOS_RUNTIME_FIXES_VERSION = 'v38-popup-config-stability-fix';
+
+    const MOJIBAKE_MAP = new Map(Object.entries({
+        'dürfen': 'dürfen', 'Dürfen': 'Dürfen',
+        'für': 'für', 'Für': 'Für',
+        'müssen': 'müssen', 'Müssen': 'Müssen',
+        'können': 'können', 'Können': 'Können',
+        'möglich': 'möglich', 'Möglich': 'Möglich',
+        'Löschen': 'Löschen', 'löschen': 'löschen',
+        'schützen': 'schützen', 'Schützen': 'Schützen',
+        'Schützt': 'Schützt', 'schützt': 'schützt',
+        'Geschützte': 'Geschützte', 'geschützte': 'geschützte',
+        'Geschützter': 'Geschützter', 'geschützter': 'geschützter',
+        'geschützten': 'geschützten', 'Geschützten': 'Geschützten',
+        'ausgewählte': 'ausgewählte', 'Ausgewählte': 'Ausgewählte',
+        'ändern': 'ändern', 'Ändern': 'Ändern',
+        'über': 'über', 'Ãœber': 'Über',
+        'Wähle': 'Wähle', 'wähle': 'wähle',
+        'öffnen': 'öffnen', 'Öffnen': 'Öffnen',
+        'schließen': 'schließen', 'Schließen': 'Schließen',
+        'Gerät': 'Gerät', 'gerät': 'gerät',
+        'Geräte': 'Geräte', 'geräte': 'geräte',
+        'Zugänge': 'Zugänge', 'zugänge': 'zugänge',
+        'Sicherheitsgründen': 'Sicherheitsgründen',
+        'Kompatibilitätsgründen': 'Kompatibilitätsgründen',
+        'Benachrichtigungen': 'Benachrichtigungen',
+        'ß': 'ß', 'Ä': 'Ä', 'Ö': 'Ö', 'Ãœ': 'Ü', 'ä': 'ä', 'ö': 'ö', 'ü': 'ü',
+        '–': '–', '—': '—', '„': '„', '“': '“', '”': '”', ' ': ' ', 'Â': ''
+    }));
+
+    const safe = fn => { try { return fn(); } catch { return undefined; } };
+
+    const repairText = value => {
+        let text = String(value || '');
+        if (!/[ÃÂâ]/.test(text)) return text;
+        for (const [from, to] of MOJIBAKE_MAP) {
+            if (text.includes(from)) text = text.split(from).join(to);
+        }
+        return text;
+    };
+
+    const skip = el => {
+        const tag = el?.tagName;
+        return tag === 'SCRIPT' || tag === 'STYLE' || tag === 'TEXTAREA' || tag === 'CODE' || tag === 'PRE';
+    };
+
+    const repairSecurityText = root => safe(() => {
+        const base = root && root.nodeType ? root : document.body || document.documentElement;
+        if (!base) return;
+        const walker = document.createTreeWalker(base, NodeFilter.SHOW_TEXT, {
+            acceptNode(node) {
+                return skip(node.parentElement) ? NodeFilter.FILTER_REJECT : NodeFilter.FILTER_ACCEPT;
+            }
+        });
+        let node;
+        while ((node = walker.nextNode())) {
+            const before = node.nodeValue || '';
+            const after = repairText(before);
+            if (after !== before) node.nodeValue = after;
+        }
+        const attrSelector = '[title],[aria-label],[placeholder],[value]';
+        const elements = base.nodeType === Node.ELEMENT_NODE && base.matches?.(attrSelector)
+            ? [base]
+            : Array.from(base.querySelectorAll?.(attrSelector) || []);
+        elements.forEach(el => {
+            if (skip(el)) return;
+            ['title', 'aria-label', 'placeholder', 'value'].forEach(attr => {
+                if (!el.hasAttribute?.(attr)) return;
+                const before = el.getAttribute(attr) || '';
+                const after = repairText(before);
+                if (after !== before) el.setAttribute(attr, after);
+            });
+        });
+    });
+
+    const isNotificationSurface = el => !!el?.closest?.([
+        '.MuiSnackbar-root',
+        '.SnackbarItem-root',
+        '.SnackbarItem-wrappedRoot',
+        '.notistack-Snackbar',
+        '.Toastify__toast',
+        '.eos-notification-safe'
+    ].join(','));
+
+    const isCloseControl = el => {
+        const label = `${el?.textContent || ''} ${el?.getAttribute?.('aria-label') || ''} ${el?.getAttribute?.('title') || ''}`.toLowerCase();
+        return /close|schlie(?:ß|ss)en|dismiss|ausblenden|ok|verstanden|x$/.test(label)
+            || !!el?.querySelector?.('svg[data-testid*="Close"], svg[data-testid*="Clear"], .material-icons');
+    };
+
+    const restoreCloseButton = button => safe(() => {
+        if (!button || !isCloseControl(button)) return;
+        button.classList.remove('eos-protected-delete-control', 'eos-security-hidden-delete', 'eos-hidden-logout', 'eos-native-logout-hidden');
+        button.removeAttribute('aria-disabled');
+        button.removeAttribute('data-eos-security-blocked');
+        if ('disabled' in button && button.disabled && !button.dataset.eosOriginalDisabled) button.disabled = false;
+        button.style.pointerEvents = 'auto';
+        button.style.visibility = 'visible';
+        button.style.opacity = '1';
+        if (button.style.display === 'none') button.style.display = '';
+    });
+
+    const repairNotifications = root => safe(() => {
+        const base = root && root.nodeType ? root : document;
+        const surfaces = Array.from(base.querySelectorAll?.([
+            '.MuiSnackbar-root',
+            '.SnackbarItem-root',
+            '.SnackbarItem-wrappedRoot',
+            '.notistack-Snackbar',
+            '.Toastify__toast'
+        ].join(',')) || []);
+        if (base.nodeType === Node.ELEMENT_NODE && isNotificationSurface(base)) surfaces.push(base);
+        surfaces.forEach(surface => {
+            surface.classList.add('eos-notification-safe');
+            surface.style.pointerEvents = 'auto';
+            surface.querySelectorAll('button,[role="button"],a,.MuiIconButton-root').forEach(restoreCloseButton);
+        });
+    });
+
+    const run = root => {
+        repairSecurityText(root);
+        repairNotifications(root);
+    };
+
+    const install = () => {
+        run(document.body || document.documentElement);
+        const observer = new MutationObserver(mutations => {
+            const roots = new Set();
+            for (const mutation of mutations) {
+                if (mutation.type === 'characterData') roots.add(mutation.target.parentElement || document.body);
+                mutation.addedNodes?.forEach(node => roots.add(node));
+            }
+            roots.forEach(root => run(root));
+        });
+        observer.observe(document.documentElement, { subtree: true, childList: true, characterData: true });
+        [250, 1000, 3000, 8000].forEach(ms => window.setTimeout(() => run(document.body || document.documentElement), ms));
+    };
+
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', install, { once: true });
+    else install();
+})();

package/adminWww/js/eos-security-ui.js

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
 
-    const VERSION = 'v31-security-text-polish';
+    const VERSION = 'v38-popup-safe-security-polish';
     const LEGACY_ADMIN = 'admin';
     const LEGACY_ADMIN_INSTANCE = 'admin.0';
     const ASSET_BASE = (() => {
@@ -34,14 +34,24 @@
         let text = String(value || '');
         const map = new Map(Object.entries({
             'dürfen': 'dürfen', 'Dürfen': 'Dürfen', 'für': 'für', 'Für': 'Für',
-            'können': 'können', 'Können': 'Können', 'möglich': 'möglich', 'Möglich': 'Möglich',
-            'Löschen': 'Löschen', 'löschen': 'löschen', 'schützen': 'schützen', 'Schützen': 'Schützen',
-            'Schützt': 'Schützt', 'schützt': 'schützt', 'Geschützte': 'Geschützte', 'geschützte': 'geschützte',
+            'müssen': 'müssen', 'Müssen': 'Müssen', 'können': 'können', 'Können': 'Können',
+            'möglich': 'möglich', 'Möglich': 'Möglich', 'Löschen': 'Löschen', 'löschen': 'löschen',
+            'schützen': 'schützen', 'Schützen': 'Schützen', 'Schützt': 'Schützt', 'schützt': 'schützt',
+            'Geschützte': 'Geschützte', 'geschützte': 'geschützte', 'Geschützter': 'Geschützter',
             'ausgewählte': 'ausgewählte', 'Ausgewählte': 'Ausgewählte', 'ändern': 'ändern', 'Ändern': 'Ändern',
             'über': 'über', 'Ãœber': 'Über', 'Wähle': 'Wähle', 'wähle': 'wähle',
-            'ß': 'ß', 'Ä': 'Ä', 'Ö': 'Ö', 'Ãœ': 'Ü', 'ä': 'ä', 'ö': 'ö', 'ü': 'ü'
+            'öffnen': 'öffnen', 'Öffnen': 'Öffnen', 'schließen': 'schließen', 'Schließen': 'Schließen',
+            'Gerät': 'Gerät', 'Geräte': 'Geräte', 'Geräteliste': 'Geräteliste',
+            'ß': 'ß', 'Ä': 'Ä', 'Ö': 'Ö', 'Ãœ': 'Ü', 'ä': 'ä', 'ö': 'ö', 'ü': 'ü', 'Â': ''
         }));
         for (const [from, to] of map) if (text.includes(from)) text = text.split(from).join(to);
+        // Generic Latin1-as-UTF8 repair for labels injected by older bundles. Guard against false positives.
+        if (/[ÃÂ]/.test(text)) {
+            try {
+                const repaired = decodeURIComponent(escape(text));
+                if (/[äöüÄÖÜß]/.test(repaired) && !/[ÃÂ]/.test(repaired)) text = repaired;
+            } catch { /* keep mapped text */ }
+        }
         return text;
     };
     const normalizeFlat = value => normalize(value).toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '');
@@ -220,12 +230,14 @@
     };
 
     const applyPolicyToDom = () => {
-        if (isAdapterConfigSurface()) return;
+        // Text repair is safe and must also run on adapter config pages.
+        replaceTextNodes();
         const admin = isAdminUser();
         document.documentElement.classList.toggle('eos-security-admin-user', admin);
         document.documentElement.classList.toggle('eos-security-non-admin-user', !admin);
         document.documentElement.classList.toggle('eos-security-nonadmin', !admin);
-        replaceTextNodes();
+        releaseNotificationControls();
+        if (isAdapterConfigSurface()) return;
         hideLegacyAdminPanels();
         hideProtectedDeleteControls();
         hideEosSecuritySettingsForNonAdmins();
@@ -233,6 +245,25 @@
 
     const isAdapterConfigSurface = () => document.documentElement.classList.contains('eos-adapter-config-surface') || /Instanzeinstellungen:|Instance settings:|Geräteliste|Gerät hinzufügen|Gerät bearbeiten/i.test(document.body?.textContent || '');
 
+    const releaseNotificationControls = () => {
+        // v38: security UI must not modify generic dialogs or adapter popups.
+        // Only snackbar/toast surfaces are normalized for clickability.
+        const roots = [
+            '.MuiSnackbar-root', '.SnackbarItem-root', '.SnackbarItem-wrappedRoot',
+            '.notistack-Snackbar', '.Toastify__toast-container', '.Toastify__toast'
+        ].join(',');
+        document.querySelectorAll(roots).forEach(box => {
+            if (box.closest('.MuiDialog-root,.MuiModal-root,.MuiPopover-root,.MuiPopper-root,.MuiMenu-root,[role="dialog"]')) return;
+            box.classList.add('eos-notification-safe');
+            box.style.pointerEvents = 'auto';
+            box.querySelectorAll('button, [role="button"], a, .MuiIconButton-root').forEach(control => {
+                control.classList.remove('eos-protected-delete-control', 'eos-security-hidden-delete');
+                control.style.pointerEvents = 'auto';
+                control.style.visibility = '';
+            });
+        });
+    };
+
     const scheduleApply = () => {
         if (state.scheduled) return;
         state.scheduled = true;
@@ -271,6 +302,8 @@
     document.addEventListener('click', event => {
         const target = event.target?.closest?.('button,[role="button"],a,[role="menuitem"],.MuiMenuItem-root');
         if (!target || isAdminUser() || isAdapterConfigSurface()) return;
+        // Native Admin dialogs, install/autocomplete poppers and adapter-owned menus must stay untouched.
+        if (target.closest?.('.MuiDialog-root,.MuiModal-root,.MuiPopover-root,.MuiPopper-root,.MuiMenu-root,.MuiAutocomplete-popper,[role="dialog"],[role="listbox"],[role="menu"]')) return;
         const label = normalizeFlat(`${target.textContent || ''} ${target.getAttribute?.('title') || ''} ${target.getAttribute?.('aria-label') || ''}`);
         if (/loschen|delete|remove|deinstall|uninstall/.test(label)) {
             target.classList.add('eos-security-hidden-delete');

package/build/i18n/de.json

@@ -25,9 +25,9 @@
   "Password is too short (min 6 chars)": "Das Passwort ist zu kurz (mindestens 6 Zeichen)",
   "Password repeat": "Passwort wiederholen",
   "Password successfully changed for \"%s\"": "Passwort für „%s“ erfolgreich geändert",
-  "Schützt ausgewählte Adapter für Installateur-/Endkundenbenutzer über Administrator-ACLs und EOS-UI-Regeln. dontDelete und nondeletable bleiben false, damit Updates weiter funktionieren.": "Schützt ausgewählte Adapter für Installateur- und Endkundenbenutzer über Administratorrechte und EOS-Regeln. dontDelete und nondeletable bleiben false, damit Updates weiter funktionieren.",
+  "Schützt ausgewählte Adapter in der EOS Oberfläche vor kritischen Aktionen durch Installateur- und Endkundenrollen. Adaptereigene Funktionen und Updates bleiben möglich.": "Schützt ausgewählte Adapter für Installateur- und Endkundenbenutzer über Administratorrechte und EOS-Regeln. dontDelete und nondeletable bleiben false, damit Updates weiter funktionieren.",
   "Set password": "Passwort festlegen",
-  "Setzt Administrator-ACLs auf die geschützte Adapterliste. Installateur-/Endkundenbenutzer können diese Adapter nicht stoppen, aktivieren oder löschen; Administratoren können sie weiterhin updaten und warten.": "Setzt Administratorrechte auf die geschützte Adapterliste. Installateur- und Endkundenbenutzer können diese Adapter nicht stoppen, aktivieren oder löschen. Administratoren können sie weiterhin updaten und warten.",
+  "Blendet kritische Aktionen für Installateur- und Endkundenrollen aus. Harte ACL-Sperren werden nicht auf Runtime-Adapter gesetzt, damit BackItUp und adaptereigene Konfigurationen stabil bleiben.": "Setzt Administratorrechte auf die geschützte Adapterliste. Installateur- und Endkundenbenutzer können diese Adapter nicht stoppen, aktivieren oder löschen. Administratoren können sie weiterhin updaten und warten.",
   "Sperr-Adresse des alten Admins": "Sperr-Adresse des alten Admins",
   "Sperr-Port des alten Admins": "Sperr-Port des alten Admins",
   "The password for user \"%s\" was successfully changed": "Das Passwort für den Benutzer „%s“ wurde erfolgreich geändert",