iobroker.eos-admin 7.9.68 → 7.9.69

package/adminWww/js/eos-toolbar-ghost-cleanup.js

@@ -0,0 +1,102 @@
+(() => {
+    'use strict';
+
+    window.NEXOWATT_EOS_TOOLBAR_CLEANUP_VERSION = 'v69-v57-header-restore';
+
+    const PRIMARY_SELECTOR = '.eos-brand-badge, .eos-system-brand, [data-eos-primary-brand="true"]';
+    const HIDDEN_CLASS = 'eos-native-compact-identity-hidden';
+
+    const hide = element => {
+        if (!element || element.matches?.(PRIMARY_SELECTOR) || element.closest?.(PRIMARY_SELECTOR) || element.querySelector?.(PRIMARY_SELECTOR)) return;
+        const text = `${element.textContent || ''} ${element.getAttribute?.('aria-label') || ''} ${element.getAttribute?.('title') || ''}`.toLowerCase();
+        if (text.includes('nexowatt eos') || text.includes('energy operation system')) return;
+        element.classList.add(HIDDEN_CLASS);
+        element.setAttribute('aria-hidden', 'true');
+        element.setAttribute('inert', '');
+        element.querySelectorAll?.('a,button,[role="button"],input,select,textarea').forEach(control => {
+            control.setAttribute('tabindex', '-1');
+            control.setAttribute('aria-hidden', 'true');
+        });
+    };
+
+    const directChild = (container, node) => {
+        let current = node;
+        while (current?.parentElement && current.parentElement !== container) current = current.parentElement;
+        return current?.parentElement === container ? current : null;
+    };
+
+    const cleanToolbar = toolbar => {
+        if (!toolbar) return;
+        const children = Array.from(toolbar.children || []);
+        children.forEach((child, index) => {
+            if (!child?.querySelector || child.matches(PRIMARY_SELECTOR) || child.querySelector(PRIMARY_SELECTOR)) return;
+            const easy = child.querySelector('a[href*="#easy"], a[href*="/easy"]');
+            if (!easy) return;
+            hide(child);
+
+            const previous = children[index - 1];
+            if (previous && !previous.matches(PRIMARY_SELECTOR) && !previous.querySelector?.(PRIMARY_SELECTOR)) {
+                const rect = previous.getBoundingClientRect?.();
+                const isSmallControl = previous.matches?.('button,.MuiIconButton-root') || !!previous.querySelector?.('button,.MuiIconButton-root');
+                const hasMenuOrChevron = !!previous.querySelector?.('svg[data-testid="MenuIcon"],svg[data-testid="ChevronLeftIcon"],svg[data-testid="ChevronRightIcon"]');
+                if (isSmallControl && (hasMenuOrChevron || !rect || (rect.width <= 72 && rect.height <= 72))) hide(previous);
+            }
+        });
+    };
+
+    const cleanDrawer = drawer => {
+        if (!drawer) return;
+        drawer.querySelectorAll('a[href*="#easy"], a[href*="/easy"]').forEach(link => {
+            const child = directChild(drawer, link);
+            if (!child || child.classList?.contains('MuiList-root') || child.querySelector?.('.MuiListItemButton-root')) return;
+            hide(child);
+        });
+    };
+
+    const cleanByGeometry = () => {
+        if (!window.matchMedia('(min-width: 901px)').matches) return;
+        document.querySelectorAll('a[href*="#easy"], a[href*="/easy"]').forEach(link => {
+            if (link.closest(PRIMARY_SELECTOR)) return;
+            const rect = link.getBoundingClientRect?.();
+            const alt = Array.from(link.querySelectorAll?.('img') || []).map(img => img.alt || '').join(' ').toLowerCase();
+            const text = `${link.textContent || ''} ${alt}`.trim().toLowerCase();
+            if (!rect || rect.top > 105 || rect.left > 240 || rect.width > 220 || rect.height > 90) return;
+            if (text.includes('nexowatt eos') || text.includes('energy operation system')) return;
+            let candidate = link;
+            for (let i = 0; i < 5 && candidate.parentElement; i += 1) {
+                const parent = candidate.parentElement;
+                if (parent.matches(PRIMARY_SELECTOR) || parent.querySelector(PRIMARY_SELECTOR)) break;
+                const r = parent.getBoundingClientRect?.();
+                if (!r || r.top > 105 || r.left > 240 || r.width > 240 || r.height > 95) break;
+                candidate = parent;
+                if (parent.matches('.MuiToolbar-root,.MuiDrawer-paper,.MuiAppBar-root')) break;
+            }
+            if (!candidate.matches('.MuiToolbar-root,.MuiDrawer-paper,.MuiAppBar-root')) hide(candidate);
+        });
+    };
+
+    let scheduled = false;
+    const run = () => {
+        scheduled = false;
+        if (!document.getElementById('app-paper')) return;
+        document.querySelectorAll('.MuiAppBar-root .MuiToolbar-root, header .MuiToolbar-root').forEach(cleanToolbar);
+        document.querySelectorAll('.MuiDrawer-paper, .MuiSwipeableDrawer-paper').forEach(cleanDrawer);
+        cleanByGeometry();
+    };
+    const schedule = () => {
+        if (scheduled) return;
+        scheduled = true;
+        requestAnimationFrame(run);
+    };
+
+    if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', schedule, { once: true });
+    else schedule();
+
+    const observer = new MutationObserver(schedule);
+    observer.observe(document.documentElement, { childList: true, subtree: true });
+    window.addEventListener('resize', schedule, { passive: true });
+    window.addEventListener('hashchange', schedule, { passive: true });
+    setTimeout(schedule, 250);
+    setTimeout(schedule, 1000);
+    setTimeout(schedule, 3000);
+})();

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "eos-admin",
-    "version": "7.9.68",
+    "version": "7.9.69",
     "titleLang": {
       "en": "NexoWatt EOS Admin",
       "de": "NexoWatt EOS Admin",
@@ -259,7 +259,7 @@
     "icon": "admin.svg",
     "messagebox": true,
     "enabled": true,
-    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.68/admin/admin.svg",
+    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.69/admin/admin.svg",
     "keywords": [
       "NexoWatt",
       "EOS",
@@ -270,7 +270,7 @@
       "licensed"
     ],
     "compact": true,
-    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.68/README.md",
+    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.69/README.md",
     "authors": [
       "bluefox <bluefox@ccu.io>",
       "hobbyquaker <hq@ccu.io>"
@@ -339,7 +339,7 @@
     "nondeletable": false,
     "allowAdapterUpdate": true,
     "allowAdapterDelete": false,
-    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.68/io-package.json",
+    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.69/io-package.json",
     "npmPackage": "iobroker.eos-admin",
     "packetName": "iobroker.eos-admin"
   },
@@ -1018,5 +1018,5 @@
       }
     }
   },
-  "version": "7.9.68"
+  "version": "7.9.69"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.eos-admin",
   "description": "NexoWatt EOS Admin interface with reliable repository update mapping and technical log preservation.",
-  "version": "7.9.68",
+  "version": "7.9.69",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",

package/tools/nexowatt-validate-package.cjs

@@ -81,7 +81,7 @@ for (const asset of [
   if (!new RegExp(`${escaped}\\?v=${cacheTag}(?:["'])`).test(adminIndex)) fail(`adminWww/index.html cache tag is stale for ${asset}`);
   if (!new RegExp(`${escaped}\\?v=${cacheTag}(?:["'])`).test(sourceIndex)) fail(`src-admin/index.html cache tag is stale for ${asset}`);
 }
-for (const entry of ['hostInit-v61.js', 'index-CQZugZ1z-v68.js']) {
+for (const entry of ['hostInit-v61.js', 'index-CQZugZ1z-v69.js']) {
   const escaped = entry.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
   if (!new RegExp(`${escaped}\\?v=${cacheTag}(?:["'])`).test(adminIndex)) fail(`adminWww/index.html entry cache tag is stale for ${entry}`);
 }
@@ -117,32 +117,27 @@ if (!branding.includes('isAdapterConfigSurface')) fail('eos-branding.js lacks na
 if (!branding.includes('Adapter UIs must remain 100% functional')) fail('eos-branding.js lacks native adapter config interaction guard');
 if (!branding.includes('v38: All native Admin dialogs') || !branding.includes('ensurePopupCompatibility')) fail('eos-branding.js lacks v38 popup compatibility guard');
 
-if (!branding.includes('eos-native-drawer-header-hidden') || !branding.includes("header.setAttribute('inert', '')")) fail('eos-branding.js lacks the native drawer-header guard');
-if (!branding.includes('removeStrayNativeDrawerHeaders') || !branding.includes('a[href=\"/#easy\"]')) fail('eos-branding.js lacks structural native drawer-header cleanup');
-if (!branding.includes('ensureStandaloneNavToggle')) fail('eos-branding.js lacks the independent EOS navigation toggle');
+if (!branding.includes('patchDrawerHeader') || !branding.includes('ensureStandaloneNavToggle')) fail('eos-branding.js lacks the known-good v57 shell controls');
+if (!branding.includes('removeSmallTopLeftNativeNexoWattTab') || !branding.includes('eos-small-top-left-native-tab-hidden')) fail('eos-branding.js lacks the bounded small top-left tab fallback');
 const activeGraph = [
-  fs.readFileSync(path.join(root, 'adminWww/assets/index-CQZugZ1z-v68.js'), 'utf8'),
-  fs.readFileSync(path.join(root, 'adminWww/assets/bootstrap-COulQZax-v68.js'), 'utf8'),
+  fs.readFileSync(path.join(root, 'adminWww/assets/index-CQZugZ1z-v69.js'), 'utf8'),
+  fs.readFileSync(path.join(root, 'adminWww/assets/bootstrap-COulQZax-v69.js'), 'utf8'),
   fs.readFileSync(path.join(root, 'adminWww/remoteEntry-v61.js'), 'utf8'),
 ].join('\n');
-if (/bootstrap-COulQZax-v61\.js|(?:AdapterUpdateDialog|Adapters|Config|CustomTab|DeviceManager|EasyMode|Enums|Fields|Files|Hosts|Instances|Intro|Logs|Objects|Users)-[^\"']+-v61\.js/.test(activeGraph)) fail('active v67 frontend graph still imports a v61 application runtime/route chunk');
+if (/bootstrap-COulQZax-v61\.js|(?:AdapterUpdateDialog|Adapters|Config|CustomTab|DeviceManager|EasyMode|Enums|Fields|Files|Hosts|Instances|Intro|Logs|Objects|Users)-[^"']+-v61\.js/.test(activeGraph)) fail('active v69 frontend graph still imports a v61 application runtime/route chunk');
 
 const drawerSource = fs.readFileSync(path.join(root, 'src-admin/src/components/Drawer.tsx'), 'utf8');
-const activeBootstrap = fs.readFileSync(path.join(root, 'adminWww/assets/bootstrap-COulQZax-v68.js'), 'utf8');
+const activeBootstrap = fs.readFileSync(path.join(root, 'adminWww/assets/bootstrap-COulQZax-v69.js'), 'utf8');
 const brandingCss = fs.readFileSync(path.join(root, 'adminWww/css/eos-branding.css'), 'utf8');
-if (!drawerSource.includes('if (!this.isSwipeable())') || !drawerSource.includes('return null;')) fail('Drawer.tsx still renders the native desktop drawer header');
-if (!activeBootstrap.includes('getHeader(){if(!this.isSwipeable())return null;')) fail('active bootstrap still renders the native desktop drawer header');
-if (!brandingCss.includes('a[href=\"/#easy\"]') || !brandingCss.includes('data-eos-native-drawer-header-hidden')) fail('branding CSS lacks structural native drawer-header fallback');
+if (!drawerSource.includes('getHeader(): JSX.Element {') || drawerSource.includes('getHeader(): JSX.Element | null')) fail('Drawer.tsx is not restored to the v57 header baseline');
+if (!activeBootstrap.includes('getHeader(){const{state:e,handleNavigation:a}=this.props;')) fail('active bootstrap is not restored to the v57 Drawer.getHeader baseline');
+if (!brandingCss.includes('v32: keep arrow button, remove empty left tile') || !brandingCss.includes('eos-small-top-left-native-tab-hidden')) fail('branding CSS lacks the v57 header baseline or narrow fallback');
 
 const appSource = fs.readFileSync(path.join(root, 'src-admin/src/App.tsx'), 'utf8');
-if (!branding.includes('eos-primary-brand') || !branding.includes('toolbar.firstElementChild')) fail('branding lacks robust primary EOS brand insertion');
-if (!branding.includes('removeNativeTopLeftGhost') || !branding.includes('a[href=\"/#easy\"]')) fail('branding lacks exact native toolbar ghost removal');
-if (!brandingCss.includes('data-eos-primary-brand') || !brandingCss.includes('v7.9.68: exact native desktop toolbar ghost removal')) fail('branding CSS lacks primary-brand/exact-toolbar safeguards');
-if (!activeBootstrap.includes('getHeader(){if(!this.isSwipeable())return null;')) fail('fresh v68 bootstrap still renders desktop Drawer.getHeader()');
-if (!appSource.includes('{small && (') || !appSource.includes('{small &&\n                    this.state.drawerState')) fail('App.tsx still renders native desktop toolbar identity controls');
-if (!activeBootstrap.includes('children:[e&&jsxRuntimeExports.jsx(')) fail('v68 bootstrap still renders native desktop MenuIcon');
-if (!activeBootstrap.includes('this.renderLoggedUser(),e&&this.state.drawerState')) fail('v68 bootstrap still renders the native desktop compact identity block');
-if (!activeBootstrap.includes('const version$b=\"7.9.68\"')) fail('v68 bootstrap frontend version marker is stale');
+if (!appSource.includes('!small && this.state.drawerState !== DrawerStates.closed ? styles.hide : undefined')) fail('App.tsx is not restored to the v57 toolbar baseline');
+if (!activeBootstrap.includes('style:{...styles.menuButton,...!e&&this.state.drawerState!==STATES.closed?styles.hide:void 0}')) fail('active bootstrap is not restored to the v57 desktop MenuIcon behavior');
+if (!activeBootstrap.includes('this.renderLoggedUser(),this.state.drawerState!==STATES.opened')) fail('active bootstrap is not restored to the v57 compact identity behavior');
+if (!activeBootstrap.includes('const version$b="7.9.69"')) fail('v69 bootstrap frontend version marker is stale');
 
 for (const file of [
   'AdapterUpdateDialog-BMg84Hpf-v67.js', 'Adapters-B5_jQ7DE-v67.js', 'Config-hHK2UzGP-v67.js',