iobroker.eos-admin 7.9.67 → 7.9.68

package/adminWww/assets/bootstrap-COulQZax.js

@@ -1,2 +1 @@
-import "./bootstrap-COulQZax-v60.js";
-export * from "./bootstrap-COulQZax-v60.js";
+export * from "./bootstrap-COulQZax-v68.js";

package/adminWww/assets/index-CQZugZ1z-v67.js

@@ -1,2 +1 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./bootstrap-COulQZax-v67.js","./DefaultPropsProvider-BiXBMQYQ.js","./_commonjsHelpers-CE1G-McA.js","./iobroker_admin__mf_v__runtimeInit__mf_v__-g2X2zhAf.js","./emotion-serialize.esm-Q4o_CgeF.js","./iobroker_admin__loadShare___mf_0_emotion_mf_1_react__loadShare__-BywLg1Xe.js","./iobroker_admin__loadShare__react__loadShare__-LM7uyL45.js","./ace-DEUjyTIn.js","./iobroker_admin__loadShare___mf_0_iobroker_mf_1_adapter_mf_2_react_mf_2_v5__loadShare__-LFZoiUTt.js","./iobroker_admin__loadShare___mf_0_iobroker_mf_1_json_mf_2_config__loadShare__-CpA7pnS5.js","./iobroker_admin__loadShare__leaflet__loadShare__-CNUAG3AH.js","./ext-language_tools-ylAoucDh.js","./iobroker_admin__loadShare__react_mf_2_dropzone__loadShare__-CwjnV48g.js","./iobroker_admin__loadShare__react_mf_2_dom__loadShare__-CVeAXnkk.js","./preload-helper-BDBacUwf.js","./iobroker_admin__loadShare___mf_0_mui_mf_1_icons_mf_2_material__loadShare__-CJO5yP3h.js","./sdk-C-e-e2gd.js","./extends-CF3RwP-h.js","./assertThisInitialized-B0aQ9eG_.js","./useTheme-Bl-M1DYp.js","./createTheme-DFX8CY6F.js","./blue-CagzI6CQ.js","./index-DcK0RDrH.js","./ThemeProvider-BOFFjWAF.js","./emotion-cache.browser.esm-BgJfNZJN.js","./setYear-3ufv5yRD.js","./en-US-DBFJNIH6.js","./bootstrap-D57bMhRi.css"])))=>i.map(i=>d[i]);
-import{_ as c}from"./preload-helper-BDBacUwf.js";import"./iobroker_admin__mf_v__runtimeInit__mf_v__-g2X2zhAf.js";(function(){const t=document.createElement("link").relList;if(t&&t.supports&&t.supports("modulepreload"))return;for(const e of document.querySelectorAll('link[rel="modulepreload"]'))s(e);new MutationObserver(e=>{for(const r of e)if(r.type==="childList")for(const o of r.addedNodes)o.tagName==="LINK"&&o.rel==="modulepreload"&&s(o)}).observe(document,{childList:!0,subtree:!0});function n(e){const r={};return e.integrity&&(r.integrity=e.integrity),e.referrerPolicy&&(r.referrerPolicy=e.referrerPolicy),e.crossOrigin==="use-credentials"?r.credentials="include":e.crossOrigin==="anonymous"?r.credentials="omit":r.credentials="same-origin",r}function s(e){if(e.ep)return;e.ep=!0;const r=n(e);fetch(e.href,r)}})();c(()=>import("./bootstrap-COulQZax-v67.js").then(i=>i.o),__vite__mapDeps([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27]),import.meta.url);
+import "./index-CQZugZ1z-v68.js";

package/adminWww/assets/index-CQZugZ1z-v68.js

@@ -0,0 +1,2 @@
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./bootstrap-COulQZax-v68.js","./DefaultPropsProvider-BiXBMQYQ.js","./_commonjsHelpers-CE1G-McA.js","./iobroker_admin__mf_v__runtimeInit__mf_v__-g2X2zhAf.js","./emotion-serialize.esm-Q4o_CgeF.js","./iobroker_admin__loadShare___mf_0_emotion_mf_1_react__loadShare__-BywLg1Xe.js","./iobroker_admin__loadShare__react__loadShare__-LM7uyL45.js","./ace-DEUjyTIn.js","./iobroker_admin__loadShare___mf_0_iobroker_mf_1_adapter_mf_2_react_mf_2_v5__loadShare__-LFZoiUTt.js","./iobroker_admin__loadShare___mf_0_iobroker_mf_1_json_mf_2_config__loadShare__-CpA7pnS5.js","./iobroker_admin__loadShare__leaflet__loadShare__-CNUAG3AH.js","./ext-language_tools-ylAoucDh.js","./iobroker_admin__loadShare__react_mf_2_dropzone__loadShare__-CwjnV48g.js","./iobroker_admin__loadShare__react_mf_2_dom__loadShare__-CVeAXnkk.js","./preload-helper-BDBacUwf.js","./iobroker_admin__loadShare___mf_0_mui_mf_1_icons_mf_2_material__loadShare__-CJO5yP3h.js","./sdk-C-e-e2gd.js","./extends-CF3RwP-h.js","./assertThisInitialized-B0aQ9eG_.js","./useTheme-Bl-M1DYp.js","./createTheme-DFX8CY6F.js","./blue-CagzI6CQ.js","./index-DcK0RDrH.js","./ThemeProvider-BOFFjWAF.js","./emotion-cache.browser.esm-BgJfNZJN.js","./setYear-3ufv5yRD.js","./en-US-DBFJNIH6.js","./bootstrap-D57bMhRi.css"])))=>i.map(i=>d[i]);
+import{_ as c}from"./preload-helper-BDBacUwf.js";import"./iobroker_admin__mf_v__runtimeInit__mf_v__-g2X2zhAf.js";(function(){const t=document.createElement("link").relList;if(t&&t.supports&&t.supports("modulepreload"))return;for(const e of document.querySelectorAll('link[rel="modulepreload"]'))s(e);new MutationObserver(e=>{for(const r of e)if(r.type==="childList")for(const o of r.addedNodes)o.tagName==="LINK"&&o.rel==="modulepreload"&&s(o)}).observe(document,{childList:!0,subtree:!0});function n(e){const r={};return e.integrity&&(r.integrity=e.integrity),e.referrerPolicy&&(r.referrerPolicy=e.referrerPolicy),e.crossOrigin==="use-credentials"?r.credentials="include":e.crossOrigin==="anonymous"?r.credentials="omit":r.credentials="same-origin",r}function s(e){if(e.ep)return;e.ep=!0;const r=n(e);fetch(e.href,r)}})();c(()=>import("./bootstrap-COulQZax-v68.js").then(i=>i.o),__vite__mapDeps([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27]),import.meta.url);

package/adminWww/css/eos-branding.css

@@ -3948,3 +3948,30 @@ html.eos-app [data-eos-native-top-left-ghost="true"] {
         flex: 0 0 0 !important;
     }
 }
+
+
+/* === NexoWatt EOS v7.9.68: exact native desktop toolbar ghost removal ===
+   The unwanted pill consists of two independent App.renderToolbar siblings:
+   the native MenuIcon button and the compact /#easy identity block. The large
+   .eos-primary-brand is deliberately excluded and remains visible. */
+@media (min-width: 901px) {
+    html.eos-app .eos-top-toolbar > button:has(svg[data-testid="MenuIcon"]),
+    html.eos-app .eos-top-toolbar > .MuiIconButton-root:has(svg[data-testid="MenuIcon"]),
+    html.eos-app .eos-top-toolbar > *:not(.eos-brand-badge):not(.eos-primary-brand):has(a[href="/#easy"]),
+    html.eos-app .eos-top-toolbar > *:not(.eos-brand-badge):not(.eos-primary-brand):has(a[href$="#easy"]) {
+        display: none !important;
+        visibility: hidden !important;
+        opacity: 0 !important;
+        pointer-events: none !important;
+        width: 0 !important;
+        min-width: 0 !important;
+        max-width: 0 !important;
+        height: 0 !important;
+        min-height: 0 !important;
+        max-height: 0 !important;
+        flex: 0 0 0 !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        overflow: hidden !important;
+    }
+}

package/adminWww/index.html

@@ -4,8 +4,8 @@
     translate="no"
 >
     <head>
-          <script src="./js/eos-console-quiet.js?v=67"></script>
-          <script type="module" src="./assets/hostInit-v61.js?v=67"></script>
+          <script src="./js/eos-console-quiet.js?v=68"></script>
+          <script type="module" src="./assets/hostInit-v61.js?v=68"></script>
         
         <meta charset="utf-8" />
         <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
@@ -35,7 +35,7 @@
             rel="stylesheet"
             href="css/leaflet.css"
         />
-        <link rel="stylesheet" href="./css/eos-branding.css?v=67" />
+        <link rel="stylesheet" href="./css/eos-branding.css?v=68" />
         <link
             rel="manifest"
             href="manifest.json"
@@ -155,15 +155,15 @@
                 false,
             );
         </script>
-      <script type="module" crossorigin src="./assets/index-CQZugZ1z-v67.js?v=67"></script>
+      <script type="module" crossorigin src="./assets/index-CQZugZ1z-v68.js?v=68"></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=67"></script>
-            <script defer src="./js/eos-adapter-surface-cleanup.js?v=67"></script>
-            <script defer src="./js/eos-security-ui.js?v=67"></script>
-            <script defer src="./js/eos-role-ui.js?v=67"></script>
-            <script defer src="./js/eos-assistant.js?v=67"></script>
-            <script defer src="./js/eos-objects-state-tools.js?v=67"></script>
+            <script defer src="./js/eos-branding.js?v=68"></script>
+            <script defer src="./js/eos-adapter-surface-cleanup.js?v=68"></script>
+            <script defer src="./js/eos-security-ui.js?v=68"></script>
+            <script defer src="./js/eos-role-ui.js?v=68"></script>
+            <script defer src="./js/eos-assistant.js?v=68"></script>
+            <script defer src="./js/eos-objects-state-tools.js?v=68"></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 = 'v67-primary-logo-restore-native-ghost-remove';
+    window.NEXOWATT_EOS_UI_VERSION = 'v68-exact-native-toolbar-ghost-remove';
 
     const BRAND = 'NexoWatt EOS';
     const EOS_MEANING = 'Energy Operation System';
@@ -844,35 +844,50 @@
     const removeNativeTopLeftGhost = () => safe(() => {
         if (!window.matchMedia('(min-width: 901px)').matches) return;
 
-        // Source 1: upstream Drawer.getHeader() identity + chevron block.
+        // Exact source of the unwanted pill in App.renderToolbar(): two sibling
+        // controls are visually combined by the EOS header CSS. Remove them
+        // independently; never touch the primary .eos-brand-badge.
+        const toolbar = document.querySelector(
+            '#root > .MuiPaper-root > .MuiAppBar-root .MuiToolbar-root, header .MuiToolbar-root, .MuiAppBar-root .MuiToolbar-root',
+        );
+        if (toolbar) {
+            Array.from(toolbar.children || []).forEach(child => {
+                if (!child?.querySelector) return;
+                if (
+                    child.matches?.('.eos-brand-badge, .eos-primary-brand') ||
+                    child.querySelector?.('.eos-brand-badge, .eos-primary-brand')
+                ) return;
+
+                // Native compact identity block: contains /#easy and the short
+                // NexoWatt image. It is a separate sibling from the menu button.
+                if (child.querySelector('a[href="/#easy"], a[href$="#easy"], a[href*="/#easy"]')) {
+                    hideNativeTopLeftGhost(child);
+                    return;
+                }
+
+                // Native desktop MenuIcon button. MUI exposes data-testid in
+                // normal builds; the SVG path check is a fallback for stripped builds.
+                const menuIcon = child.querySelector('svg[data-testid="MenuIcon"]');
+                const menuPath = child.querySelector('svg path')?.getAttribute?.('d') || '';
+                const isMenuPath = /M3\s*18h18v-?2H3v2|M3\s*6h18v2H3z/.test(menuPath.replace(/,/g, ' '));
+                if ((child.matches('button, .MuiIconButton-root') || child.querySelector('button, .MuiIconButton-root')) && (menuIcon || isMenuPath)) {
+                    hideNativeTopLeftGhost(child);
+                }
+            });
+        }
+
+        // Compatibility fallback for an old cached Drawer.getHeader() DOM.
         document.querySelectorAll('.MuiDrawer-paper, .MuiSwipeableDrawer-paper').forEach(drawer => {
             Array.from(drawer.children || []).forEach(child => {
                 if (!child?.querySelector) return;
-                const text = normalize(child.textContent || '');
-                const hasIdentity = !!child.querySelector('a[href*="#easy"], img, .MuiAvatar-root') || /nexowatt|iobroker/.test(text);
-                const hasToggle = !!child.querySelector('button, .MuiIconButton-root, [role="button"]');
+                const hasEasyLink = !!child.querySelector('a[href="/#easy"], a[href$="#easy"], a[href*="/#easy"]');
+                const hasChevron = !!child.querySelector('svg[data-testid="ChevronLeftIcon"], svg[data-testid="ChevronRightIcon"]');
                 const isNavigationList = child.classList?.contains('MuiList-root') || !!child.querySelector('.MuiListItemButton-root');
-                if (hasIdentity && hasToggle && !isNavigationList) hideNativeTopLeftGhost(child);
+                if (hasEasyLink && hasChevron && !isNavigationList) hideNativeTopLeftGhost(child);
             });
         });
 
-        // Source 2: stale native compact identity rendered as a small top-left
-        // AppBar child. Use geometry + short label, and explicitly protect the
-        // large primary EOS badge.
-        document.querySelectorAll('.MuiAppBar-root .MuiToolbar-root > *, .eos-top-toolbar > *').forEach(child => {
-            if (!child?.querySelector || child.matches?.('.eos-brand-badge, .eos-primary-brand')) return;
-            if (child.querySelector('.eos-brand-badge, .eos-primary-brand')) return;
-            const text = normalize(child.textContent || '');
-            const hasShortIdentity = text === 'nexowatt' || text === 'iobroker' || /^nexowatt\s*$/.test(text);
-            const hasEasyLink = !!child.querySelector('a[href*="#easy"]');
-            const hasToggle = !!child.querySelector('button, .MuiIconButton-root, svg');
-            const rect = child.getBoundingClientRect?.();
-            const isTopLeft = rect && rect.top < 105 && rect.left < 220 && rect.width < 230 && rect.height < 100;
-            if (isTopLeft && (hasShortIdentity || hasEasyLink) && hasToggle) hideNativeTopLeftGhost(child);
-        });
-
-        // Restore/verify the correct large EOS identity after cleanup.
-        const toolbar = document.querySelector('#root > .MuiPaper-root > .MuiAppBar-root .MuiToolbar-root, header .MuiToolbar-root, .MuiAppBar-root .MuiToolbar-root');
+        // Restore/verify the wanted large EOS identity after cleanup.
         if (toolbar) ensureBrandBadge(toolbar);
     });
 

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "eos-admin",
-    "version": "7.9.67",
+    "version": "7.9.68",
     "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.67/admin/admin.svg",
+    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.68/admin/admin.svg",
     "keywords": [
       "NexoWatt",
       "EOS",
@@ -270,7 +270,7 @@
       "licensed"
     ],
     "compact": true,
-    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.67/README.md",
+    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.68/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.67/io-package.json",
+    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.68/io-package.json",
     "npmPackage": "iobroker.eos-admin",
     "packetName": "iobroker.eos-admin"
   },
@@ -1018,5 +1018,5 @@
       }
     }
   },
-  "version": "7.9.64"
+  "version": "7.9.68"
 }

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.67",
+  "version": "7.9.68",
   "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-v67.js']) {
+for (const entry of ['hostInit-v61.js', 'index-CQZugZ1z-v68.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}`);
 }
@@ -121,14 +121,14 @@ if (!branding.includes('eos-native-drawer-header-hidden') || !branding.includes(
 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');
 const activeGraph = [
-  fs.readFileSync(path.join(root, 'adminWww/assets/index-CQZugZ1z-v67.js'), 'utf8'),
-  fs.readFileSync(path.join(root, 'adminWww/assets/bootstrap-COulQZax-v67.js'), 'utf8'),
+  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/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');
 
 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-v67.js'), 'utf8');
+const activeBootstrap = fs.readFileSync(path.join(root, 'adminWww/assets/bootstrap-COulQZax-v68.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');
@@ -136,10 +136,13 @@ if (!brandingCss.includes('a[href=\"/#easy\"]') || !brandingCss.includes('data-e
 
 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('eos-native-top-left-ghost-hidden')) fail('branding lacks exact native top-left ghost removal');
-if (!brandingCss.includes('data-eos-primary-brand') || !brandingCss.includes('data-eos-native-top-left-ghost')) fail('branding CSS lacks primary-brand/ghost safeguards');
-if (!activeBootstrap.includes('getHeader(){if(!this.isSwipeable())return null;')) fail('fresh v67 bootstrap still renders desktop Drawer.getHeader()');
-if (!activeBootstrap.includes('children:[jsxRuntimeExports.jsx(')) fail('v67 bootstrap did not restore the normal toolbar structure required by the EOS brand injector');
+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');
 
 for (const file of [
   'AdapterUpdateDialog-BMg84Hpf-v67.js', 'Adapters-B5_jQ7DE-v67.js', 'Config-hHK2UzGP-v67.js',
@@ -148,7 +151,7 @@ for (const file of [
   'Hosts-Bg8QzW5i-v67.js', 'Instances-YdaGnS5a-v67.js', 'Intro-DkwRiz1n-v67.js',
   'Logs-CsVPSLJH-v67.js', 'Objects-DPan0bzw-v67.js', 'Users-BgnBRgwU-v67.js',
 ]) {
-  if (!exists(path.join('adminWww/assets', file))) fail(`missing fresh v67 route chunk: ${file}`);
+  if (!exists(path.join('adminWww/assets', file))) fail(`missing compatible route chunk: ${file}`);
   const chunk = fs.readFileSync(path.join(root, 'adminWww/assets', file), 'utf8');
   if (chunk.includes('bootstrap-COulQZax-v61.js')) fail(`${file} still imports bootstrap-v61`);
 }