iobroker.eos-admin 7.9.96 → 7.9.98

package/adminWww/js/eos-ems-overview.js

@@ -1,50 +1,72 @@
 (() => {
     'use strict';
-    const VERSION = 'v96-nexowatt-ems-overview-runtime';
+    const VERSION = 'v98-nexowatt-ems-overview-runtime';
     const CONTRACT = 'nexowatt-ems-overview-v1';
     const ROOT_ID = 'eos-ems-overview-runtime';
     const POLL_MS = 5000;
+    const RETRY_MS = 650;
+    const CONNECTION_WAIT_MS = 12000;
     const STALE_MS = 20000;
+    const REQUIRED_UI_VERSION = '0.8.198';
     const COLORS = { ok: '#01bc69', info: '#48b9ff', warning: '#ffbd59', error: '#ff5f72' };
     let timer = 0;
+    let retryTimer = 0;
     let inFlight = false;
     let destroyed = false;
+    let socketCache = null;
+    let startedAt = Date.now();
 
     const esc = value => String(value ?? '').replace(/[&<>"']/g, character => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[character]));
     const text = (value, fallback = '') => String(value ?? fallback).replace(/\s+/g, ' ').trim() || fallback;
     const num = (value, fallback = 0) => Number.isFinite(Number(value)) ? Number(value) : fallback;
-    const parse = (value, fallback) => {
-        if (value && typeof value === 'object') return value;
-        try { return JSON.parse(String(value ?? '')); } catch (_) { return fallback; }
-    };
-    const severity = value => {
-        const normalized = String(value || '').toLowerCase();
-        if (normalized === 'error') return 'error';
-        if (normalized === 'warning' || normalized === 'warn') return 'warning';
-        if (normalized === 'ok') return 'ok';
-        return 'info';
-    };
+    const parse = (value, fallback) => { if (value && typeof value === 'object') return value; try { return JSON.parse(String(value ?? '')); } catch (_) { return fallback; } };
+    const severity = value => { const normalized = String(value || '').toLowerCase(); if (normalized === 'error') return 'error'; if (normalized === 'warning' || normalized === 'warn') return 'warning'; if (normalized === 'ok') return 'ok'; return 'info'; };
     const currentTab = () => String(location.hash || '').match(/tab-[a-z0-9_-]+/i)?.[0]?.toLowerCase() || 'tab-intro';
     const currentRole = () => String(window.NEXOWATT_EOS_ACCESS_ROLE || 'admin').toLowerCase();
     const technical = () => ['admin', 'service', 'installer', 'installateur'].includes(currentRole());
-    const formatPower = value => {
-        const watts = num(value); const absolute = Math.abs(watts); const sign = watts < 0 ? '−' : '';
-        return absolute >= 1000 ? `${sign}${(absolute / 1000).toLocaleString('de-DE', { minimumFractionDigits: 1, maximumFractionDigits: 2 })} kW` : `${sign}${Math.round(absolute).toLocaleString('de-DE')} W`;
-    };
-    const formatAge = timestamp => {
-        const value = num(timestamp); if (!value) return 'noch kein Regeltick';
-        const seconds = Math.max(0, Math.round((Date.now() - value) / 1000));
-        if (seconds < 2) return 'gerade eben';
-        if (seconds < 60) return `vor ${seconds} s`;
-        return `vor ${Math.round(seconds / 60)} min`;
-    };
-    const formatClock = timestamp => {
-        const value = num(timestamp); if (!value) return '—';
-        try { return new Date(value).toLocaleTimeString('de-DE', { hour: '2-digit', minute: '2-digit', second: '2-digit' }); } catch (_) { return '—'; }
-    };
-    const getSocket = () => window.NEXOWATT_EOS_ADMIN_SOCKET || window.NEXOWATT_EOS_SOCKET || null;
+    const formatPower = value => { const watts = num(value); const absolute = Math.abs(watts); const sign = watts < 0 ? '−' : ''; return absolute >= 1000 ? `${sign}${(absolute / 1000).toLocaleString('de-DE', { minimumFractionDigits: 1, maximumFractionDigits: 2 })} kW` : `${sign}${Math.round(absolute).toLocaleString('de-DE')} W`; };
+    const formatAge = timestamp => { const value = num(timestamp); if (!value) return 'noch kein Regeltick'; const seconds = Math.max(0, Math.round((Date.now() - value) / 1000)); if (seconds < 2) return 'gerade eben'; if (seconds < 60) return `vor ${seconds} s`; return `vor ${Math.round(seconds / 60)} min`; };
+    const formatClock = timestamp => { const value = num(timestamp); if (!value) return '—'; try { return new Date(value).toLocaleTimeString('de-DE', { hour: '2-digit', minute: '2-digit', second: '2-digit' }); } catch (_) { return '—'; } };
     const stateVal = (states, id) => states?.[id]?.val;
 
+    const isAdminSocket = candidate => Boolean(candidate && typeof candidate.getForeignStates === 'function');
+    const rememberSocket = candidate => {
+        if (!isAdminSocket(candidate)) return null;
+        socketCache = candidate;
+        try { window.NEXOWATT_EOS_ADMIN_SOCKET = candidate; window.NEXOWATT_EOS_SOCKET = candidate; } catch (_) { /* best effort */ }
+        return candidate;
+    };
+    const socketFromFrames = () => {
+        for (const frame of [window, window.parent, window.top]) {
+            try {
+                const candidate = frame?.NEXOWATT_EOS_ADMIN_SOCKET || frame?.NEXOWATT_EOS_SOCKET;
+                if (isAdminSocket(candidate)) return rememberSocket(candidate);
+            } catch (_) { /* cross-origin frame */ }
+        }
+        return null;
+    };
+    const socketFromReact = () => {
+        const roots = [document.getElementById('app-paper'), document.getElementById('root')].filter(Boolean);
+        const seen = new Set();
+        const inspect = value => {
+            if (!value || (typeof value !== 'object' && typeof value !== 'function') || seen.has(value)) return null;
+            seen.add(value);
+            if (isAdminSocket(value)) return rememberSocket(value);
+            for (const key of ['socket', 'props', 'memoizedProps', 'memoizedState', 'stateNode', 'return', 'child', 'sibling']) {
+                try { const found = inspect(value[key]); if (found) return found; } catch (_) { /* ignore inaccessible property */ }
+            }
+            return null;
+        };
+        for (const root of roots) {
+            for (const key of Object.getOwnPropertyNames(root)) {
+                if (!key.startsWith('__react')) continue;
+                try { const found = inspect(root[key]); if (found) return found; } catch (_) { /* ignore */ }
+            }
+        }
+        return null;
+    };
+    const getSocket = () => isAdminSocket(socketCache) ? socketCache : (socketFromFrames() || socketFromReact());
+
     const normalizeInstances = (states, aliveStates) => {
         const prefixes = new Set();
         Object.keys(states || {}).forEach(id => { const match = id.match(/^(nexowatt-ui\.\d+)\.info\.adminOverview\./); if (match) prefixes.add(match[1]); });
@@ -68,18 +90,53 @@
         if (!root) {
             root = document.createElement('section');
             root.id = ROOT_ID;
-            root.className = 'eos-ems-overview-card';
+            root.className = 'eos-ems-overview-card is-loading';
             root.dataset.nexowattContract = CONTRACT;
         }
         const hero = document.getElementById('eos-native-overview-hero');
         if (hero?.parentElement === paper) paper.insertBefore(root, hero.nextSibling); else paper.insertBefore(root, paper.firstChild || null);
         return root;
     };
-
-    const unavailable = message => {
+    const setMode = (root, mode) => { root.classList.remove('is-loading', 'is-unavailable', 'is-ready'); root.classList.add(`is-${mode}`); };
+    const loading = message => {
+        const root = ensureRoot(); if (!root) return;
+        setMode(root, 'loading');
+        root.style.setProperty('--eos-ems-status-color', COLORS.info);
+        root.innerHTML = `<header class="eos-ems-overview-header"><div><span class="eos-ems-overview-eyebrow">NexoWatt EMS</span><h2>Live-Diagnose wird verbunden</h2><p>${esc(message)}</p></div><div class="eos-ems-overview-state"><span class="eos-ems-overview-state-dot eos-ems-overview-state-dot--pulse"></span><strong>Verbindung</strong><small>automatischer Neuversuch</small></div></header>`;
+    };
+    const unavailable = (message, detail = '') => {
         const root = ensureRoot(); if (!root) return;
+        setMode(root, 'unavailable');
         root.style.setProperty('--eos-ems-status-color', COLORS.info);
-        root.innerHTML = `<header class="eos-ems-overview-header"><div><span class="eos-ems-overview-eyebrow">NexoWatt EMS</span><h2>Live-Diagnose</h2><p>${esc(message)}</p></div><div class="eos-ems-overview-state"><span class="eos-ems-overview-state-dot"></span><strong>Nicht verfügbar</strong><small>read-only</small></div></header><footer class="eos-ems-overview-footer"><span>Die Kachel liest ausschließlich info.adminOverview.*.</span><span>Keine EMS-Regelung wurde verändert.</span></footer>`;
+        root.innerHTML = `<header class="eos-ems-overview-header"><div><span class="eos-ems-overview-eyebrow">NexoWatt EMS</span><h2>Live-Diagnose nicht verfügbar</h2><p>${esc(message)}</p>${detail ? `<small class="eos-ems-overview-help">${esc(detail)}</small>` : ''}</div><div class="eos-ems-overview-state"><span class="eos-ems-overview-state-dot"></span><strong>Nicht verfügbar</strong><small>read-only</small></div></header><footer class="eos-ems-overview-footer"><span>Die Kachel liest ausschließlich info.adminOverview.*.</span><span>Keine EMS-Regelung wurde verändert.</span></footer>`;
+    };
+    const semverAtLeast = (value, minimum) => {
+        const parseVersion = input => String(input || '').split('-')[0].split('.').map(part => Number.parseInt(part, 10) || 0);
+        const current = parseVersion(value); const required = parseVersion(minimum);
+        for (let index = 0; index < Math.max(current.length, required.length); index++) {
+            const left = current[index] || 0; const right = required[index] || 0;
+            if (left !== right) return left > right;
+        }
+        return true;
+    };
+    const readUiAdapterInfo = async socket => {
+        try {
+            if (typeof socket.getAdapterInstances === 'function') {
+                const rows = await socket.getAdapterInstances('nexowatt-ui', true);
+                const instances = Array.isArray(rows) ? rows : [];
+                const selected = instances.find(row => row?.common?.enabled) || instances[0];
+                if (selected) return { installed: true, enabled: selected.common?.enabled !== false, version: text(selected.common?.version, ''), id: text(selected._id, '') };
+            }
+        } catch (_) { /* next fallback */ }
+        try {
+            if (typeof socket.getObjectViewSystem === 'function') {
+                const rows = await socket.getObjectViewSystem('instance', 'system.adapter.nexowatt-ui.', 'system.adapter.nexowatt-ui.香');
+                const values = Array.isArray(rows) ? rows : Object.values(rows || {});
+                const selected = values.find(row => row?.common?.enabled) || values[0];
+                if (selected) return { installed: true, enabled: selected.common?.enabled !== false, version: text(selected.common?.version, ''), id: text(selected._id, '') };
+            }
+        } catch (_) { /* permission or compatibility */ }
+        return { installed: false, version: '', enabled: false, id: '' };
     };
 
     const fallbackDecisions = summary => {
@@ -91,9 +148,10 @@
 
     const render = data => {
         const root = ensureRoot(); if (!root) return;
+        setMode(root, 'ready');
         const summary = data.summary || {}; const budget = summary.budget || {}; const charging = summary.charging || {}; const storage = summary.storage || {}; const ems = summary.ems || {}; const para14a = summary.para14a || {}; const tariff = summary.tariff || {}; const forecast = summary.forecast || {}; const peak = summary.peakShaving || {};
         const stale = data.alive === false || !data.updatedAt || Date.now() - data.updatedAt > STALE_MS;
-        const status = stale ? 'error' : severity(summary.status); const statusColor = COLORS[status]; root.style.setProperty('--eos-ems-status-color', statusColor);
+        const status = stale ? 'error' : severity(summary.status); root.style.setProperty('--eos-ems-status-color', COLORS[status]);
         const totalBudget = Math.max(0, num(budget.totalW)); const remaining = Math.max(0, num(budget.remainingW)); const percent = totalBudget > 0 ? Math.max(0, Math.min(100, remaining / totalBudget * 100)) : 0;
         const isTechnical = technical(); const decisions = (Array.isArray(summary.currentDecisions) ? summary.currentDecisions : fallbackDecisions(summary)).slice(0, isTechnical ? 5 : 2); const events = isTechnical ? data.events.slice(0, 6) : [];
         const tags = [];
@@ -110,17 +168,48 @@
         root.innerHTML = `<header class="eos-ems-overview-header"><div><span class="eos-ems-overview-eyebrow">NexoWatt EMS · Live-Diagnose</span><h2>${esc(stale ? 'EMS-Diagnose ist nicht aktuell' : text(summary.headline, 'EMS arbeitet normal'))}</h2><p>${esc(stale ? 'Adapter oder Diagnosewerte sind älter als 20 Sekunden. Die Werte werden als veraltet markiert.' : text(summary.reason, 'EMS arbeitet innerhalb aller aktiven Grenzen.'))}</p></div><div class="eos-ems-overview-state"><span class="eos-ems-overview-state-dot"></span><strong>${stale ? 'Offline / veraltet' : ({ok:'Normal',info:'Information',warning:'Begrenzt',error:'Störung'}[status])}</strong><small>${esc(data.instance)} · ${esc(formatAge(data.updatedAt))}</small></div></header><div class="eos-ems-overview-metrics">${metrics}</div>${totalBudget > 0 ? `<div class="eos-ems-overview-budget" title="${percent.toFixed(1)} % Restbudget"><span style="width:${percent}%"></span></div>` : ''}${tags.length ? `<div class="eos-ems-overview-tags">${tags.map(tag => `<span class="${tag.warning ? 'is-warning' : ''}">${esc(tag.label)}</span>`).join('')}</div>` : ''}<div class="eos-ems-overview-columns"><div class="eos-ems-overview-panel"><h3>Aktuelle Regelentscheidungen</h3>${decisionsHtml}</div><div class="eos-ems-overview-panel"><h3>${isTechnical ? 'Letzte EMS-Ereignisse' : 'Systemerklärung'}</h3>${eventsHtml}</div></div><footer class="eos-ems-overview-footer"><span>Diagnose ist rein lesend. Keine Kachel besitzt Schreibhoheit.</span><a href="${esc(detailsUrl)}" target="_blank" rel="noreferrer">Vollständige EMS-Diagnose öffnen ↗</a></footer>`;
     };
 
+    const scheduleFastRetry = () => {
+        if (destroyed || retryTimer) return;
+        retryTimer = window.setTimeout(() => { retryTimer = 0; void load(); }, RETRY_MS);
+    };
     const load = async () => {
         if (destroyed || inFlight || document.visibilityState === 'hidden' || currentTab() !== 'tab-intro') return;
         const socket = getSocket();
-        if (!socket?.getForeignStates) { unavailable('Die Admin-Verbindung wird noch aufgebaut.'); return; }
+        if (!socket) {
+            if (Date.now() - startedAt < CONNECTION_WAIT_MS) {
+                loading('Die sichere Admin-Verbindung wird hergestellt. Die Kachel aktualisiert sich automatisch.');
+                scheduleFastRetry();
+            } else {
+                unavailable('Die Admin-Verbindung konnte nicht übernommen werden.', 'Bitte die Seite einmal mit Strg + F5 neu laden. Die übrige EOS-Oberfläche bleibt unverändert nutzbar.');
+            }
+            return;
+        }
         inFlight = true;
         try {
-            const [states, alive] = await Promise.all([socket.getForeignStates('nexowatt-ui.*.info.adminOverview.*'), socket.getForeignStates('system.adapter.nexowatt-ui.*.alive')]);
+            const [states, alive] = await Promise.all([
+                socket.getForeignStates('nexowatt-ui.*.info.adminOverview.*'),
+                socket.getForeignStates('system.adapter.nexowatt-ui.*.alive'),
+            ]);
             const instances = normalizeInstances(states || {}, alive || {});
-            if (instances.length) render(instances[0]); else unavailable('NexoWatt UI ist nicht installiert, offline oder der Diagnosevertrag info.adminOverview.* fehlt.');
-        } catch (error) { unavailable(`EMS-Diagnose konnte nicht gelesen werden: ${text(error?.message || error, 'unbekannter Fehler')}`); }
-        finally { inFlight = false; }
+            if (instances.length) {
+                render(instances[0]);
+            } else {
+                const info = await readUiAdapterInfo(socket);
+                if (!info.installed) {
+                    unavailable('NexoWatt UI ist nicht installiert oder für dieses Benutzerkonto nicht sichtbar.', `Für die vollständige Kachel wird iobroker.nexowatt-ui ab ${REQUIRED_UI_VERSION} benötigt.`);
+                } else if (info.version && !semverAtLeast(info.version, REQUIRED_UI_VERSION)) {
+                    unavailable(`NexoWatt UI ${info.version} ist installiert, enthält den Diagnosevertrag aber noch nicht.`, `Bitte NexoWatt UI mindestens auf ${REQUIRED_UI_VERSION} aktualisieren und die Instanz danach neu starten.`);
+                } else if (info.enabled === false) {
+                    unavailable(`NexoWatt UI ${info.version || ''} ist installiert, aber deaktiviert.`, 'Bitte die UI-Instanz starten. Danach aktualisiert sich die Kachel automatisch.');
+                } else {
+                    unavailable(`NexoWatt UI ${info.version || ''} ist aktiv, veröffentlicht aber noch keine info.adminOverview.*-Werte.`, 'Bitte die NexoWatt-UI-Instanz einmal neu starten. Bleibt der Channel aus, ist der AdminOverviewPublisher der installierten UI-Version zu prüfen.');
+                }
+            }
+        } catch (error) {
+            const message = text(error?.message || error, 'unbekannter Fehler');
+            const permission = /permission|access|not allowed|denied/i.test(message);
+            unavailable(permission ? 'Dieses Benutzerkonto darf die EMS-Diagnosewerte derzeit nicht lesen.' : `EMS-Diagnose konnte nicht gelesen werden: ${message}`, permission ? 'Die Datenpunkte unter nexowatt-ui.*.info.adminOverview.* benötigen Leserechte für die jeweilige EOS-Rolle.' : 'Die Kachel ist rein lesend; es wurde keine EMS-Regelung verändert.');
+        } finally { inFlight = false; }
     };
 
     const apply = () => {
@@ -129,12 +218,20 @@
         if (currentTab() !== 'tab-intro') { document.getElementById(ROOT_ID)?.remove(); return; }
         ensureRoot(); void load();
     };
+    const onSocketReady = event => {
+        rememberSocket(event?.detail?.socket || window.NEXOWATT_EOS_ADMIN_SOCKET || window.NEXOWATT_EOS_SOCKET);
+        startedAt = Date.now();
+        if (retryTimer) { clearTimeout(retryTimer); retryTimer = 0; }
+        void load();
+    };
     const start = () => {
+        startedAt = Date.now();
         apply();
         timer = window.setInterval(apply, POLL_MS);
         window.addEventListener('hashchange', apply);
+        window.addEventListener('nexowatt-eos-admin-socket-ready', onSocketReady);
         document.addEventListener('visibilitychange', apply);
     };
     document.readyState === 'loading' ? document.addEventListener('DOMContentLoaded', start, { once: true }) : start();
-    window.NEXOWATT_EOS_EMS_OVERVIEW = Object.freeze({ version: VERSION, contract: CONTRACT, refresh: apply, destroy() { destroyed = true; if (timer) clearInterval(timer); document.getElementById(ROOT_ID)?.remove(); } });
+    window.NEXOWATT_EOS_EMS_OVERVIEW = Object.freeze({ version: VERSION, contract: CONTRACT, refresh: apply, destroy() { destroyed = true; if (timer) clearInterval(timer); if (retryTimer) clearTimeout(retryTimer); window.removeEventListener('nexowatt-eos-admin-socket-ready', onSocketReady); document.getElementById(ROOT_ID)?.remove(); } });
 })();

package/adminWww/js/eos-role-bootstrap.js

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
 
-    const VERSION = 'v96-first-login-password-native-overview';
+    const VERSION = 'v98-first-login-password-native-overview';
     const script = document.currentScript || document.querySelector('script[src*="eos-role-bootstrap.js"]');
     const entry = script?.dataset?.eosEntry || '';
     let launched = false;
@@ -192,13 +192,13 @@
             submit.disabled = true; submit.textContent = t.saving; setStatus('', '');
             try {
                 const response = await fetch(endpoint, {
-                    method: 'POST', credentials: 'same-origin', cache: 'no-store',
+                    method: 'POST', credentials: 'include', cache: 'no-store',
                     headers: { 'Content-Type': 'application/json', Accept: 'application/json', 'X-NexoWatt-EOS-First-Login': '1' },
                     body: JSON.stringify({ password: password.value, passwordRepeat: repeat.value }),
                 });
                 const data = await response.json().catch(() => ({}));
                 if (!response.ok || data.error) {
-                    const messages = { passwordRequired: t.required, passwordMismatch: t.mismatch, passwordLength: t.length(minLength), passwordComplexity: t.complexity, passwordTooEasy: t.easy };
+                    const messages = { passwordRequired: t.required, passwordMismatch: t.mismatch, passwordLength: t.length(minLength), passwordComplexity: t.complexity, passwordTooEasy: t.easy, passwordSetupNotAllowed: t.generic, invalidRequestOrigin: t.generic, passwordApiUnavailable: t.generic, passwordWriteFailed: t.generic, passwordVerificationFailed: t.generic, userObjectUnavailableAfterPasswordChange: t.generic };
                     throw new Error(messages[data.error] || t.generic);
                 }
                 setStatus(t.success, 'success');
@@ -265,7 +265,7 @@
             submit.disabled = true; submit.textContent = t.saving; setStatus('', '');
             try {
                 const response = await fetch(endpoint, {
-                    method: 'POST', credentials: 'same-origin', cache: 'no-store',
+                    method: 'POST', credentials: 'include', cache: 'no-store',
                     headers: { 'Content-Type': 'application/json', Accept: 'application/json', 'X-NexoWatt-EOS-Passwordless-Password': '1' },
                     body: JSON.stringify({ password: password.value, passwordRepeat: repeat.value }),
                 });
@@ -473,7 +473,7 @@
             setStatus(card, t.claimChecking, '');
             try {
                 const response = await fetch(new URL('nexowatt/account/passwordless-claim', base).href, {
-                    method: 'POST', credentials: 'same-origin', cache: 'no-store',
+                    method: 'POST', credentials: 'include', cache: 'no-store',
                     headers: { 'Content-Type': 'application/json', Accept: 'application/json', 'X-NexoWatt-EOS-Passwordless-Claim': '1' },
                     body: JSON.stringify({ user: account }),
                 });
@@ -500,7 +500,7 @@
             const { username, password, card, submit } = loginElements();
             if (!username || !password || !card) return;
             card.classList.add('eos-login-card-modern');
-            // v96 compact normal-login first activation: do not add role buttons or a second panel.
+            // v98 compact normal-login first activation: do not add role buttons or a second panel.
             // The account is entered in the existing Loginname field; a blank password is accepted only
             // after the backend confirms that this exact managed account is eligible.
             card.querySelectorAll('.eos-login-role-selector').forEach(element => element.remove());
@@ -634,7 +634,7 @@
     const timeout = window.setTimeout(() => controller.abort(), 8000);
 
     window.NEXOWATT_EOS_BOOTSTRAP_READY = fetch(contextUrl, {
-        credentials: 'same-origin', cache: 'no-store', headers: { Accept: 'application/json' }, signal: controller.signal,
+        credentials: 'include', cache: 'no-store', headers: { Accept: 'application/json' }, signal: controller.signal,
     })
         .then(response => { if (!response.ok) throw new Error(`HTTP ${response.status}`); return response.json(); })
         .then(policy => {

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

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
 
-    const VERSION = 'v96-native-overview-ems-live-reserve-filter';
+    const VERSION = 'v98-native-overview-ems-live-reserve-filter';
     window.NEXOWATT_EOS_ROLE_UI_VERSION = VERSION;
 
     const state = {
@@ -278,7 +278,7 @@
         });
     };
     const ensureSafeOverview = () => safe(() => {
-        // 7.9.96: never cover the real Admin Intro with a second tile surface.
+        // 7.9.97: never cover the real Admin Intro with a second tile surface.
         // Installer and end-user use the native card component; security remains
         // enforced by route/instance filters and backend permissions.
         removeSafeOverview();

package/adminWww/js/nexowatt-native-shell.js

@@ -1,7 +1,7 @@
 (() => {
     'use strict';
 
-    const VERSION = 'v96-nexowatt-native-shell-native-overview';
+    const VERSION = 'v98-nexowatt-native-shell-native-overview';
     const previous = window.NEXOWATT_NATIVE_SHELL;
     if (previous?.version === VERSION) return;
     previous?.destroy?.();
@@ -150,7 +150,8 @@
         const paper = document.getElementById('app-paper');
         const role = String(window.NEXOWATT_EOS_ACCESS_ROLE || 'unknown').toLowerCase();
         if (!paper || isLogin() || currentTab() !== 'tab-intro' || role === 'unknown') {
-            document.getElementById('eos-native-overview-hero')?.remove();
+            const staleHero = document.getElementById('eos-native-overview-hero');
+            if (staleHero?.dataset.eosRuntimeOverviewHero === 'true') staleHero.remove();
             return;
         }
         const config = role === 'admin'
@@ -159,12 +160,18 @@
                 ? { label: 'Installateur', text: 'Inbetriebnahme, Fehlersuche, Geräte- und EMS-Diagnose – mit deinen freigegebenen Installateurrechten.' }
                 : { label: 'Endkunde', text: 'Energie, Laden, Gebäude und die aktuellen EMS-Entscheidungen auf einen Blick.' };
         let hero = document.getElementById('eos-native-overview-hero');
+        // A freshly built Intro.tsx owns this node. Do not rewrite React children.
+        if (hero?.dataset.eosNativeReactOverview === 'true') return;
+        // The bundled Admin-7 runtime predates the React hero. Supply one compatibility node until
+        // the next complete frontend rebuild; it uses the same role text and native-card surface.
         if (!hero) {
             hero = document.createElement('section');
             hero.id = 'eos-native-overview-hero';
             hero.className = 'eos-overview-hero eos-native-overview-hero';
+            hero.dataset.eosRuntimeOverviewHero = 'true';
             paper.insertBefore(hero, paper.firstChild || null);
         }
+        if (hero.dataset.eosRuntimeOverviewHero !== 'true') return;
         hero.innerHTML = `
             <div><span class="eos-overview-eyebrow">NexoWatt EOS</span><h1>Übersicht</h1><p>${config.text}</p></div>
             <div class="eos-overview-role" data-nexowatt-overview-role="${role}"><span class="eos-overview-status-dot"></span>${config.label}</div>`;

package/adminWww/static/js/nexowatt-stable-login.js

@@ -1,79 +1,45 @@
-/* NexoWatt EOS stable runtime v96 */
+/* NexoWatt EOS stable runtime v98 */
 (() => {
   'use strict';
   const MANAGED_USERS = new Set(['installer', 'guest', 'user']);
   const ASSIST_TEXT = /EOS\s*Assist/i;
   const PASSWORDLESS_TEXT = /Erstanmeldung\s+ohne\s+Passwort|first\s+sign-?in\s+without\s+password/i;
   const isLogin = () => /(?:\?|&)login(?:[=&]|$)/i.test(location.search) || /\/login(?:[/?#]|$)/i.test(location.pathname + location.hash);
-  const visible = el => !!el && el.getClientRects().length > 0;
+  const visible = element => !!element && element.getClientRects().length > 0;
   const findInput = kind => {
     const inputs = [...document.querySelectorAll('input')].filter(visible);
-    if (kind === 'password') return inputs.find(i => i.type === 'password');
-    return inputs.find(i => i.type !== 'password' && /user|login|name/i.test(`${i.name} ${i.id} ${i.autocomplete} ${i.getAttribute('aria-label')||''}`)) || inputs.find(i => i.type !== 'password');
+    if (kind === 'password') return inputs.find(input => input.type === 'password');
+    return inputs.find(input => input.type !== 'password' && /user|login|name/i.test(`${input.name} ${input.id} ${input.autocomplete} ${input.getAttribute('aria-label') || ''}`)) || inputs.find(input => input.type !== 'password');
   };
-  const findSubmit = () => [...document.querySelectorAll('button,input[type="submit"]')].find(el => visible(el) && (/anmelden|login|sign in/i.test((el.textContent||el.value||'').trim()) || el.type === 'submit'));
-  const commonAncestor = (a,b) => {
-    if (!a || !b) return null;
-    const parents = new Set(); let n=a;
-    while(n){parents.add(n);n=n.parentElement;}
-    n=b; while(n&&!parents.has(n))n=n.parentElement;
-    return n;
-  };
-  const markLogin = () => {
+  const findSubmit = () => [...document.querySelectorAll('button,input[type="submit"]')].find(element => visible(element) && (/anmelden|login|sign in/i.test((element.textContent || element.value || '').trim()) || element.type === 'submit'));
+  const sync = () => {
     if (!isLogin()) return;
-    document.documentElement.classList.add('nw-eos-login-v96');
-    document.body?.classList.add('nw-eos-login-v96');
-    const u=findInput('user'), p=findInput('password'), submit=findSubmit();
-    if (u && p) {
-      let card=commonAncestor(u,p);
-      while(card && card.parentElement && card.querySelectorAll('input').length < 2) card=card.parentElement;
-      if (card) {
-        card.setAttribute('data-nw-login-card','true');
-        let outer=card.parentElement;
-        for(let i=0;i<3 && outer?.parentElement;i++){
-          if(outer.getBoundingClientRect().width > card.getBoundingClientRect().width+20) break;
-          outer=outer.parentElement;
-        }
-        outer?.setAttribute('data-nw-login-shell','true');
-      }
-      const sync=()=>{
-        const name=(u.value||'').trim().toLowerCase();
-        const pass=p.value||'';
-        if(submit && MANAGED_USERS.has(name) && !pass){
-          submit.disabled=true;
-          submit.setAttribute('aria-disabled','true');
-        }
-      };
-      if(!u.dataset.nwV96){u.dataset.nwV96='1';u.addEventListener('input',sync);p.addEventListener('input',sync);sync();}
+    document.documentElement.classList.add('nw-eos-login-v98');
+    document.body?.classList.add('nw-eos-login-v98');
+    const username = findInput('user');
+    const password = findInput('password');
+    const submit = findSubmit();
+    const account = String(username?.value || '').trim().toLowerCase().replace(/^system\.user\./, '');
+    if (submit && MANAGED_USERS.has(account) && !String(password?.value || '')) {
+      submit.disabled = true;
+      submit.setAttribute('aria-disabled', 'true');
     }
   };
   const hideLegacyUi = () => {
-    for (const el of document.querySelectorAll('button,a,[role="button"],div,span')) {
-      const text=(el.textContent||'').trim();
-      if(!text || text.length>100) continue;
-      if(ASSIST_TEXT.test(text) || PASSWORDLESS_TEXT.test(text)){
-        const target=el.closest('button,a,[role="button"],[data-eos-assist],.eos-assist') || el;
-        target.style.setProperty('display','none','important');
-        target.setAttribute('aria-hidden','true');
+    for (const element of document.querySelectorAll('button,a,[role="button"],div,span')) {
+      const value = (element.textContent || '').trim();
+      if (!value || value.length > 100) continue;
+      if (ASSIST_TEXT.test(value) || PASSWORDLESS_TEXT.test(value)) {
+        const target = element.closest('button,a,[role="button"],[data-eos-assist],.eos-assist') || element;
+        target.style.setProperty('display', 'none', 'important');
+        target.setAttribute('aria-hidden', 'true');
       }
     }
   };
-  const apply=()=>{markLogin();hideLegacyUi();};
-  const style=document.createElement('style');
-  style.id='nw-eos-stable-v96-css';
-  style.textContent=`
-    html.nw-eos-login-v96,body.nw-eos-login-v96{min-height:100%;margin:0!important;overflow-x:hidden!important;overflow-y:auto!important}
-    .nw-eos-login-v96 [data-nw-login-shell="true"]{width:min(520px,calc(100vw - 28px))!important;min-height:590px!important;height:auto!important;max-height:none!important;overflow:visible!important;box-sizing:border-box!important;padding:22px!important}
-    .nw-eos-login-v96 [data-nw-login-card="true"]{width:min(460px,calc(100vw - 56px))!important;min-height:540px!important;height:auto!important;max-height:none!important;overflow:visible!important;box-sizing:border-box!important;padding-bottom:26px!important}
-    .nw-eos-login-v96 [data-nw-login-card="true"] *{scrollbar-width:none}
-    .nw-eos-login-v96 [data-nw-login-card="true"] *::-webkit-scrollbar{display:none!important;width:0!important;height:0!important}
-    .nw-eos-login-v96 [data-nw-login-card="true"] [role="alert"]{position:static!important;max-height:none!important;overflow:visible!important;white-space:normal!important}
-    [data-eos-assist],.eos-assist,.nexowatt-eos-assist{display:none!important}
-    @media(max-height:620px){.nw-eos-login-v96 [data-nw-login-shell="true"]{min-height:0!important;margin:16px auto!important}.nw-eos-login-v96 [data-nw-login-card="true"]{min-height:0!important}}
-  `;
-  (document.head||document.documentElement).appendChild(style);
-  const observer=new MutationObserver(()=>requestAnimationFrame(apply));
-  observer.observe(document.documentElement,{subtree:true,childList:true,attributes:true,attributeFilter:['class','style']});
-  if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',apply,{once:true});else apply();
-  setInterval(apply,1500);
+  const apply = () => { sync(); hideLegacyUi(); };
+  const observer = new MutationObserver(() => requestAnimationFrame(apply));
+  observer.observe(document.documentElement, { subtree: true, childList: true });
+  document.addEventListener('input', apply, true);
+  document.addEventListener('change', apply, true);
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', apply, { once: true }); else apply();
 })();

package/adminWww/static/js/nexowatt-stable-v98.js

@@ -0,0 +1,33 @@
+(() => {
+    'use strict';
+    const VERSION = 'v98-scroll-login-password-write';
+    const MANAGED_USERS = new Set(['installer', 'guest', 'user']);
+    const normalizeUser = value => String(value || '').trim().toLowerCase().replace(/^system\.user\./, '');
+    const apply = () => {
+        document.documentElement.classList.add('eos-assist-disabled');
+        document.querySelectorAll('.eos-assist-root,.eos-assist-header-root,[data-eos-assist-root],.eos-passwordless-launcher')
+            .forEach(element => element.remove());
+        const username = document.querySelector('input#username,input[name="username"]');
+        const password = document.querySelector('input#password,input[name="password"]');
+        const submit = document.querySelector('button[type="submit"],input[type="submit"]');
+        if (submit && MANAGED_USERS.has(normalizeUser(username?.value)) && !String(password?.value || '')) {
+            submit.disabled = true;
+            submit.classList.add('Mui-disabled');
+            submit.setAttribute('aria-disabled', 'true');
+        }
+    };
+    let scheduled = false;
+    const schedule = () => {
+        if (scheduled) return;
+        scheduled = true;
+        queueMicrotask(() => { scheduled = false; apply(); });
+    };
+    const start = () => {
+        apply();
+        new MutationObserver(schedule).observe(document.documentElement, { subtree: true, childList: true });
+        document.addEventListener('input', schedule, true);
+        document.addEventListener('change', schedule, true);
+    };
+    document.readyState === 'loading' ? document.addEventListener('DOMContentLoaded', start, { once: true }) : start();
+    window.NEXOWATT_EOS_STABLE_V98 = Object.freeze({ version: VERSION, refresh: apply });
+})();