iobroker.eos-admin 7.9.36 → 7.9.37

package/build/i18n/en.json

@@ -25,9 +25,9 @@
   "Password is too short (min 6 chars)": "Password is too short (min 6 chars)",
   "Password repeat": "Password repeat",
   "Password successfully changed for \"%s\"": "Password successfully changed for \"%s\"",
-  "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.": "Protects selected adapters from installer/end-customer users via administrator ACLs and EOS UI rules. dontDelete and nondeletable remain false so updates keep working.",
+  "Schützt ausgewählte Adapter in der EOS Oberfläche vor kritischen Aktionen durch Installateur- und Endkundenrollen. Adaptereigene Funktionen und Updates bleiben möglich.": "Protects selected adapters from installer/end-customer users via administrator ACLs and EOS UI rules. dontDelete and nondeletable remain false so updates keep working.",
   "Set password": "Set password",
-  "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.": "Applies administrator ACLs to the protected adapter list. Installer/end-customer users cannot stop, enable or delete these adapters; administrators can still update and maintain them.",
+  "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.": "Applies administrator ACLs to the protected adapter list. Installer/end-customer users cannot stop, enable or delete these adapters; administrators can still update and maintain them.",
   "Sperr-Adresse des alten Admins": "Legacy admin lock bind address",
   "Sperr-Port des alten Admins": "Legacy admin lock port",
   "The password for user \"%s\" was successfully changed": "The password for user \"%s\" was successfully changed",

package/build/main.js

@@ -737,7 +737,8 @@ class Admin extends adapter_core_1.Adapter {
         return this.config.eosHideLegacyAdminFromNonAdmins !== false && this.config.eosHideLegacyAdminForNonAdmins !== false && this.config.nexowattHideLegacyAdminForNonAdmins !== false;
     }
     shouldApplyAdminOnlyAclToProtectedAdapters() {
-        return this.config.eosApplyAdminOnlyAclToProtectedAdapters !== false;
+        const config = this.config;
+        return config.eosStrictProtectedAdapterAcl === true && this.config.eosApplyAdminOnlyAclToProtectedAdapters === true;
     }
     getAdminOnlyGroup() {
         const configuredGroups = normalizeAdminOnlyGroups(this.config.eosAdminOnlyGroups || this.config.eosSecurityAdminGroups);
@@ -837,8 +838,8 @@ class Admin extends adapter_core_1.Adapter {
             obj.common.nondeletable = false;
             changed = true;
         }
+        const targetAcl = this.getAdminOnlyAcl();
         if (options.adminOnlyAcl) {
-            const targetAcl = this.getAdminOnlyAcl();
             const acl = (obj.acl ||= {});
             if (acl.owner !== targetAcl.owner) {
                 acl.owner = targetAcl.owner;
@@ -853,6 +854,10 @@ class Admin extends adapter_core_1.Adapter {
                 changed = true;
             }
         }
+        else if (obj.acl && obj.acl.owner === targetAcl.owner && obj.acl.ownerGroup === targetAcl.ownerGroup && obj.acl.object === targetAcl.object) {
+            delete obj.acl;
+            changed = true;
+        }
         if (changed) {
             await this.setForeignObjectAsync(id, obj);
         }
@@ -863,7 +868,12 @@ class Admin extends adapter_core_1.Adapter {
             return;
         }
         const isEosAdmin = adapter === EOS_ADMIN_ADAPTER_NAME;
-        const adminOnlyAcl = isEosAdmin || this.shouldApplyAdminOnlyAclToProtectedAdapters();
+        const adminOnlyAcl = isEosAdmin || (this.shouldApplyAdminOnlyAclToProtectedAdapters() && adapter !== 'backitup');
+        // v37 BackItUp/runtime-adapter compatibility: keep default protection UI/role based.
+        // Do not rewrite common/ACL of runtime adapters unless explicitly configured.
+        if (!isEosAdmin && !adminOnlyAcl) {
+            return;
+        }
         let changed = await this.ensureObjectProtectionPolicy(`system.adapter.${adapter}`, {
             keepDontDelete: false,
             adminOnlyAcl,

package/docs/NEXOWATT_EOS_UI_V37_STABILITY_DE.md

@@ -0,0 +1,13 @@
+# NexoWatt EOS Admin v37
+
+## Fokus
+
+Diese Version stabilisiert drei produktive Bereiche:
+
+- Benachrichtigungsdialoge bleiben vollständig klickbar und können sauber geschlossen bzw. bestätigt werden.
+- BackItUp und andere Runtime-Adapter werden vom EOS-Sicherheitswächter standardmäßig nicht mehr über Objekt-/ACL-Umschreibungen verändert. Der Schutz läuft über EOS Rollen/UI.
+- EOS-Sicherheitstexte werden auch auf Adapter-Konfigurationsseiten gegen UTF-8/Latin1-Mojibake repariert.
+
+## Hinweise
+
+BackItUp-Fehler wie `cannot found source "undefined" for compress` kommen typischerweise aus der BackItUp-Quell-/Zielkonfiguration. v37 sorgt dafür, dass EOS Admin BackItUp nicht durch ACL/common-Änderungen beeinflusst. Die BackItUp-Konfiguration selbst muss weiterhin im BackItUp-Adapter geprüft werden.

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "eos-admin",
-    "version": "7.9.36",
+    "version": "7.9.37",
     "titleLang": {
       "en": "NexoWatt EOS Admin",
       "de": "NexoWatt EOS Admin",
@@ -18,9 +18,9 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
-      "7.9.36": {
-        "en": "Restores official admin session handling, fixes bad login redirect paths, and enables full native adapter configuration compatibility without EOS overlays blocking adapter UI actions.",
-        "de": "Stellt die offizielle Admin-Sitzungslogik wieder her, korrigiert fehlerhafte Login-Redirect-Pfade und aktiviert volle native Adapter-Konfigurationskompatibilität ohne blockierende EOS-Overlays."
+      "7.9.37": {
+        "en": "Fixes notification dialog closing/acknowledgement handling, keeps BackItUp untouched by EOS object protection, and repairs German EOS Security text encoding on settings pages.",
+        "de": "Korrigiert das Schließen/Bestätigen von Benachrichtigungen, lässt BackItUp von EOS-Objektschutz unverändert und repariert deutsche EOS-Sicherheitsbeschriftungen in den Einstellungen."
       },
       "7.9.35": {
         "en": "Fixes EOS Admin login redirect/logout origin handling and restores reliable interaction with adapter instance configuration dialogs.",
@@ -206,7 +206,7 @@
     "icon": "admin.svg",
     "messagebox": true,
     "enabled": true,
-    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.36/admin/admin.svg",
+    "extIcon": "https://unpkg.com/iobroker.eos-admin@7.9.37/admin/admin.svg",
     "keywords": [
       "NexoWatt",
       "EOS",
@@ -217,7 +217,7 @@
       "licensed"
     ],
     "compact": true,
-    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.36/README.md",
+    "readme": "https://unpkg.com/iobroker.eos-admin@7.9.37/README.md",
     "authors": [
       "bluefox <bluefox@ccu.io>",
       "hobbyquaker <hq@ccu.io>"
@@ -286,7 +286,7 @@
     "nondeletable": false,
     "allowAdapterUpdate": true,
     "allowAdapterDelete": false,
-    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.36/io-package.json",
+    "meta": "https://unpkg.com/iobroker.eos-admin@7.9.37/io-package.json",
     "npmPackage": "iobroker.eos-admin"
   },
   "native": {
@@ -349,9 +349,10 @@
       }
     ],
     "eosAdminOnlyGroup": "system.group.administrator",
-    "eosApplyAdminOnlyAclToProtectedAdapters": true,
+    "eosApplyAdminOnlyAclToProtectedAdapters": false,
     "eosAssistantEnabled": true,
-    "eosAssistantAdminOnly": false
+    "eosAssistantAdminOnly": false,
+    "eosStrictProtectedAdapterAcl": false
   },
   "notifications": [
     {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iobroker.eos-admin",
-  "description": "NexoWatt EOS Admin standalone interface for Energy Operation System",
-  "version": "7.9.36",
+  "description": "NexoWatt EOS Admin standalone interface with notification, BackItUp isolation and EOS Security text fixes",
+  "version": "7.9.37",
   "contributors": [
     "bluefox <dogafox@gmail.com>",
     "apollon77",

package/tools/nexowatt-validate-package.cjs

@@ -62,5 +62,8 @@ if (!webBuild.includes('Follow upstream admin semantics again')) fail('build/lib
 if (index.includes('eos-hard-logout.js')) fail('adminWww/index.html must not load the removed custom hard-logout timer');
 if (!branding.includes('isAdapterConfigSurface')) fail('eos-branding.js lacks native adapter config safe-mode detection');
 if (!branding.includes('Adapter UIs must remain 100% functional')) fail('eos-branding.js lacks native adapter config interaction guard');
+if (!branding.includes('v37 eos notification close compatibility')) fail('eos-branding.js lacks v37 notification close guard');
+const mainBuild = fs.readFileSync(path.join(root, 'build/main.js'), 'utf8');
+if (!mainBuild.includes('v37 BackItUp/runtime-adapter compatibility')) fail('build/main.js lacks v37 BackItUp compatibility guard');
 
 console.log('[NexoWatt EOS package validation] OK');