Merge branch 'master' into typing-250926

Author: Apollon77

CHANGELOG.md

@@ -5,6 +5,7 @@
 -->
 
 ## __WORK IN PROGRESS__
+* (@copilot) Fixed adminUI, adminTab, and adminColumns configurations being incorrectly preserved during adapter uploads
 * (@foxriver76) Added objects warn limit per instance
 * (@Apollon77) Allows only numbers for `ts` and `lc` fields in state when provided for setState
 * (@GermanBluefox) Added typing for `visIconSets` in `io-package.json`(for vis-2 SVG icon sets)

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "7.0.8-alpha.5-20250913-8ad7f66ce",
+    "version": "7.0.8-alpha.6-20250927-51faba7cb",
     "command": {
         "run": {
             "stream": true

package-lock.json

@@ -56,7 +56,7 @@
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "cpy-cli": "^4.2.0",
-    "fs-extra": "^11.1.0",
+    "fs-extra": "^11.3.2",
     "lerna": "^7.4.2",
     "mocha": "^10.4.0",
     "prettier": "^3.0.1",

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@iobroker/js-controller-adapter",
     "type": "module",
-    "version": "7.0.8-alpha.5-20250913-8ad7f66ce",
+    "version": "7.0.8-alpha.6-20250927-51faba7cb",
     "engines": {
         "node": ">=18.0.0"
     },
@@ -17,7 +17,7 @@
         "@iobroker/js-controller-common-db": "file:../common-db",
         "@iobroker/plugin-base": "~2.0.1",
         "deep-clone": "^3.0.3",
-        "fs-extra": "^11.1.0",
+        "fs-extra": "^11.3.2",
         "jsonwebtoken": "^9.0.0",
         "node-schedule": "^2.1.0",
         "node.extend": "^2.0.2",

packages/adapter/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@iobroker/js-controller-cli",
     "type": "module",
-    "version": "7.0.8-alpha.5-20250913-8ad7f66ce",
+    "version": "7.0.8-alpha.6-20250927-51faba7cb",
     "engines": {
         "node": ">=18.0.0"
     },
@@ -14,7 +14,7 @@
         "debug": "^4.3.4",
         "deep-clone": "^3.0.3",
         "event-stream": "^4.0.1",
-        "fs-extra": "^11.1.0",
+        "fs-extra": "^11.3.2",
         "mime-types": "^2.1.35",
         "promisify-child-process": "^4.1.1",
         "readline-sync": "^1.4.10",

packages/cli/package.json

@@ -509,10 +509,6 @@ Please DO NOT copy files manually into ioBroker storage directories!`,
 
             if (oldObjectsHasServer && !newObjectsHasServer) {
                 console.log(COLOR_YELLOW);
-                console.log(`Important: Using ${newConfig.objects.type} for the Objects database is only supported`);
-                console.log('with js-controller 2.0 or higher!');
-                console.log('When your system consists of multiple hosts please make sure to have');
-                console.log('js-controller 2.0 or higher installed on ALL hosts *before* continuing!');
                 if (allowMigration) {
                     console.log('');
                     console.log('');

packages/cli/src/lib/setup/setupSetup.ts

@@ -670,13 +670,20 @@ export class Upload {
                 'tier',
             ];
 
+            // Object attributes that should be completely replaced, not merged
+            const replaceAttributes = ['adminUI', 'adminTab', 'adminColumns'];
+
             for (const [attr, attrData] of Object.entries(additional)) {
                 // preserve these attributes, except, they were undefined before and preserve titleLang if current titleLang is of type string (changed by user)
                 if (preserveAttributes.includes(attr) || (attr === 'titleLang' && typeof target[attr] === 'string')) {
                     if (target[attr] === undefined) {
                         target[attr] = attrData;
                     }
-                } else if (typeof attrData !== 'object' || attrData instanceof Array) {
+                } else if (
+                    typeof attrData !== 'object' ||
+                    attrData instanceof Array ||
+                    replaceAttributes.includes(attr)
+                ) {
                     try {
                         target[attr] = attrData;
 

packages/cli/src/lib/setup/setupUpload.ts

@@ -1,7 +1,7 @@
 {
     "name": "@iobroker/js-controller-common-db",
     "type": "module",
-    "version": "7.0.8-alpha.5-20250913-8ad7f66ce",
+    "version": "7.0.8-alpha.6-20250927-51faba7cb",
     "engines": {
         "node": ">=18.0.0"
     },
@@ -16,7 +16,7 @@
         "ci-info": "^3.8.0",
         "deep-clone": "^3.0.3",
         "event-stream": "^4.0.1",
-        "fs-extra": "^11.1.0",
+        "fs-extra": "^11.3.2",
         "jsonwebtoken": "^9.0.0",
         "node-forge": "^1.3.0",
         "node.extend": "^2.0.2",

packages/common-db/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@iobroker/js-controller-common",
     "type": "module",
-    "version": "7.0.8-alpha.5-20250913-8ad7f66ce",
+    "version": "7.0.8-alpha.6-20250927-51faba7cb",
     "engines": {
         "node": ">=12.0.0"
     },
@@ -17,7 +17,7 @@
         "@iobroker/db-states-jsonl": "file:../db-states-jsonl",
         "@iobroker/db-states-redis": "file:../db-states-redis",
         "@iobroker/js-controller-common-db": "file:../common-db",
-        "fs-extra": "^11.1.0",
+        "fs-extra": "^11.3.2",
         "jszip": "^3.10.1"
     },
     "keywords": [