From beda8a8531002f3e0f5bc386b546dc27d8c80b63 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Tue, 10 Dec 2024 08:22:44 +0000
Subject: [PATCH 01/15] Corrected the rendering of custom JSON config
 components

---
 README.md                                          |  4 ++++
 packages/adapter-react-v5/README.md                |  4 ++--
 packages/admin/src-admin/package.json              |  4 ++--
 .../src/JsonConfigComponent/ConfigCustom.tsx       | 14 +++++++++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index fc461c231..c4351fecd 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,10 @@ The icons may not be reused in other projects without the proper flaticon licens
 <!--
 	### **WORK IN PROGRESS**
 -->
+### **WORK IN PROGRESS**
+
+-   (@GermanBluefox) Corrected the rendering of custom JSON config components
+
 ### 7.4.4 (2024-12-08)
 
 -   (@GermanBluefox) Showed value in object edit dialog
diff --git a/packages/adapter-react-v5/README.md b/packages/adapter-react-v5/README.md
index 5653288df..dcb1ccbbb 100644
--- a/packages/adapter-react-v5/README.md
+++ b/packages/adapter-react-v5/README.md
@@ -13,7 +13,7 @@ If you want to create the configuration page with ReactJS:
     - Change `name` from `src` to `ADAPTERNAME-admin` (Of course replace `ADAPTERNAME` with yours)
     - Add to devDependencies:
         ```json
-        "@iobroker/adapter-react-v5": "^7.4.3",
+        "@iobroker/adapter-react-v5": "^7.4.4",
         ```
         Versions can be higher.
         So your `src/package.json` should look like:
@@ -24,7 +24,7 @@ If you want to create the configuration page with ReactJS:
     "version": "0.1.0",
     "private": true,
     "dependencies": {
-        "@iobroker/adapter-react-v5": "^7.4.3",
+        "@iobroker/adapter-react-v5": "^7.4.4",
         "@iobroker/build-tools": "^1.0.0",
         "babel-eslint": "^10.1.0",
         "react-scripts": "^5.0.1"
diff --git a/packages/admin/src-admin/package.json b/packages/admin/src-admin/package.json
index 1644ae1a7..8cf943348 100644
--- a/packages/admin/src-admin/package.json
+++ b/packages/admin/src-admin/package.json
@@ -103,5 +103,5 @@
             }
         ]
     ],
-    "version": "7.4.3"
-}
+    "version": "7.4.4"
+}
\ No newline at end of file
diff --git a/packages/jsonConfig/src/JsonConfigComponent/ConfigCustom.tsx b/packages/jsonConfig/src/JsonConfigComponent/ConfigCustom.tsx
index c666620d0..449ca38ca 100644
--- a/packages/jsonConfig/src/JsonConfigComponent/ConfigCustom.tsx
+++ b/packages/jsonConfig/src/JsonConfigComponent/ConfigCustom.tsx
@@ -248,6 +248,18 @@ export default class ConfigCustom extends ConfigGeneric<ConfigCustomProps, Confi
             return item;
         }
 
-        return <CustomComponent {...this.props} />;
+        return (
+            <CustomComponent
+                {...this.props}
+                // @ts-expect-error BF (2024-12-18) Remove after the 7.4 will be mainstream. All following lines
+                socket={this.props.oContext.socket}
+                theme={this.props.oContext.theme}
+                themeType={this.props.oContext.themeType}
+                instance={this.props.oContext.instance}
+                adapterName={this.props.oContext.adapterName}
+                systemConfig={this.props.oContext.systemConfig}
+                forceUpdate={this.props.oContext.forceUpdate}
+            />
+        );
     }
 }

From a48b070192641754dfd133d0fb6078904edbadaf Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Tue, 10 Dec 2024 21:38:13 +0000
Subject: [PATCH 02/15] Corrected news dialog

---
 package-lock.json                             | 278 +++++++++---------
 packages/adapter-react-v5/package.json        |  12 +-
 .../adapter-react-v5/src/Components/Utils.tsx |   7 +-
 3 files changed, 154 insertions(+), 143 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3555d2ecb..07eb8ad80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4216,12 +4216,12 @@
             }
         },
         "node_modules/@iobroker/db-base": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-base/-/db-base-7.0.5.tgz",
-            "integrity": "sha512-sVE9oyQeGhPEeHtfTMX5efgfvp1fIWSXtIKeOOq62TfF/6DRBdpNnaFRtxzXnbhUTyaeFxaAHBxH1W0qTTWKtg==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-base/-/db-base-7.0.6.tgz",
+            "integrity": "sha512-+zXsJ7pw9AlSnD91zlDbEosfvGRtI7DwxXr2bD0kMINZpmFOJLPxdVRe1OVjOMc2+ohyibDliwqNzGyVCFkuyw==",
             "license": "MIT",
             "dependencies": {
-                "@iobroker/js-controller-common-db": "7.0.5",
+                "@iobroker/js-controller-common-db": "7.0.6",
                 "deep-clone": "^3.0.3",
                 "fs-extra": "^11.1.0",
                 "respjs": "^4.2.0"
@@ -4245,13 +4245,13 @@
             }
         },
         "node_modules/@iobroker/db-objects-file": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-file/-/db-objects-file-7.0.5.tgz",
-            "integrity": "sha512-3NuUQ75W86IaaAif/mGdFGBEN37s1svE6+0VmCOHXQDFsGoTPqrYcF3NTjlqGKokJ3FpHKLfFsrcucz1eN4q8g==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-file/-/db-objects-file-7.0.6.tgz",
+            "integrity": "sha512-Gph6eeimucIJzY4HxFZmXYx9hvvqLhC3wkPQm+w59n4jA+o5OcYWeHIBNgPJpJTjJSukhUlJAA22jWbZy+qQAw==",
             "license": "Apache 2.0",
             "dependencies": {
-                "@iobroker/db-base": "7.0.5",
-                "@iobroker/db-objects-redis": "7.0.5",
+                "@iobroker/db-base": "7.0.6",
+                "@iobroker/db-objects-redis": "7.0.6",
                 "deep-clone": "^3.0.3",
                 "fs-extra": "^11.1.0"
             },
@@ -4274,15 +4274,15 @@
             }
         },
         "node_modules/@iobroker/db-objects-jsonl": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-jsonl/-/db-objects-jsonl-7.0.5.tgz",
-            "integrity": "sha512-FSMXOeMBMDrHjr6hYAVyV0x2RutGySHNSd8NG0ct71gp6PPs0wi0tuWpIHK1DfepRGzSE/iSnqyJjb5u83PPCg==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-jsonl/-/db-objects-jsonl-7.0.6.tgz",
+            "integrity": "sha512-Kb9iW7IlK/8fm97P2TRunI/JaPWHFQesHKRPEqq696EFtLqozQMr5CwxRjrseYXFoUAk47zALjUPnPdG9dAldw==",
             "license": "Apache 2.0",
             "dependencies": {
                 "@alcalzone/jsonl-db": "~3.1.1",
-                "@iobroker/db-base": "7.0.5",
-                "@iobroker/db-objects-file": "7.0.5",
-                "@iobroker/db-objects-redis": "7.0.5",
+                "@iobroker/db-base": "7.0.6",
+                "@iobroker/db-objects-file": "7.0.6",
+                "@iobroker/db-objects-redis": "7.0.6",
                 "deep-clone": "^3.0.3",
                 "fs-extra": "^11.1.0"
             },
@@ -4305,12 +4305,12 @@
             }
         },
         "node_modules/@iobroker/db-objects-redis": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-redis/-/db-objects-redis-7.0.5.tgz",
-            "integrity": "sha512-ckoA6uZtG6bZynCbNglfwAQMckCC2sy6irmyXedGqKj9wpxgE9JlrSpL6HkLHmkpOwUtk24g2jC/nixZjhlTNg==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-redis/-/db-objects-redis-7.0.6.tgz",
+            "integrity": "sha512-BPUP5MgzxNwJCkkDhVXLNAccREOcikhNVI5DcRzrZ3j4yRbKOfjro1/Wu5/nudBMNI4pmUDP/rwE7IbfUPaV2A==",
             "license": "Apache 2.0",
             "dependencies": {
-                "@iobroker/db-base": "7.0.5",
+                "@iobroker/db-base": "7.0.6",
                 "deep-clone": "^3.0.3",
                 "ioredis": "^4.28.2",
                 "mime-types": "^2.1.35",
@@ -4322,40 +4322,40 @@
             }
         },
         "node_modules/@iobroker/db-states-file": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-states-file/-/db-states-file-7.0.5.tgz",
-            "integrity": "sha512-WLIpDuitJBOR0/kBnlSVj25Pbl8lI8BuztNIM2VqYGypfxhTfEqqn5WUN4wAhKmJZR8/a3fnkj98IWFDWfPJsQ==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-states-file/-/db-states-file-7.0.6.tgz",
+            "integrity": "sha512-MIFlOVLd9emgAoWR+vq5B+A68+YxOCGLkN7RPxQw2kUO1pomK3USrbLF4ReCFtM8GLZI/HhaT5Q+a9FBYU1+2w==",
             "license": "MIT",
             "dependencies": {
-                "@iobroker/db-base": "7.0.5",
-                "@iobroker/db-states-redis": "7.0.5"
+                "@iobroker/db-base": "7.0.6",
+                "@iobroker/db-states-redis": "7.0.6"
             },
             "engines": {
                 "node": ">=12.0.0"
             }
         },
         "node_modules/@iobroker/db-states-jsonl": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-states-jsonl/-/db-states-jsonl-7.0.5.tgz",
-            "integrity": "sha512-Z/qQgdQ7YYr+qN4xzmMCG/wPvXryhDgLRZs2X5dp9FHbpBzOotog+cvNONpZemzEe9wJRTloz/abFCBWg9XcoA==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-states-jsonl/-/db-states-jsonl-7.0.6.tgz",
+            "integrity": "sha512-KBPxXo7Z+/l9kWZBrhmNQTYALPssIzsYJ4w1qB2EbQlrlklAQV7Aodf4g+M+/pkzy7aq9BVwvzksr/yhIk1BxQ==",
             "license": "MIT",
             "dependencies": {
                 "@alcalzone/jsonl-db": "~3.1.1",
-                "@iobroker/db-base": "7.0.5",
-                "@iobroker/db-states-file": "7.0.5",
-                "@iobroker/db-states-redis": "7.0.5"
+                "@iobroker/db-base": "7.0.6",
+                "@iobroker/db-states-file": "7.0.6",
+                "@iobroker/db-states-redis": "7.0.6"
             },
             "engines": {
                 "node": ">=12.0.0"
             }
         },
         "node_modules/@iobroker/db-states-redis": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-states-redis/-/db-states-redis-7.0.5.tgz",
-            "integrity": "sha512-m5fa/0nKKJ/fGuCVmWR6uzPnCwk/v7IroYZVwPt/OlYcc2a48VUOZyXuGcH/OADobGS4hcjQiEARMaOMvnitIA==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-states-redis/-/db-states-redis-7.0.6.tgz",
+            "integrity": "sha512-HQbAzJ6Q11U9pkO4h+mI8J08D9O1IpPcGeQGDjptJOKNzQMeQ2fvTc+N+n+vtiEy/PBanNADXsi9frbcyWqWGg==",
             "license": "MIT",
             "dependencies": {
-                "@iobroker/db-base": "7.0.5",
+                "@iobroker/db-base": "7.0.6",
                 "ioredis": "^4.28.2"
             },
             "engines": {
@@ -4408,18 +4408,18 @@
             }
         },
         "node_modules/@iobroker/js-controller-common": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common/-/js-controller-common-7.0.5.tgz",
-            "integrity": "sha512-oNzW+9qZduafv8qt3KpPXddBqZJQebgjNnxjuxTnkOaVo4CtT13+LGDdGAgCrqTehytK30K+I8k6eg/ePd6Hxw==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common/-/js-controller-common-7.0.6.tgz",
+            "integrity": "sha512-W/R37U1DuR6wxdbCp0ZWdmnQiGXVTCjrOcPKysd2kABQ/wWwOuaUrtllLaB9aPzNGE7WCRqvo26U18Vm2U7fSg==",
             "license": "MIT",
             "dependencies": {
-                "@iobroker/db-objects-file": "7.0.5",
-                "@iobroker/db-objects-jsonl": "7.0.5",
-                "@iobroker/db-objects-redis": "7.0.5",
-                "@iobroker/db-states-file": "7.0.5",
-                "@iobroker/db-states-jsonl": "7.0.5",
-                "@iobroker/db-states-redis": "7.0.5",
-                "@iobroker/js-controller-common-db": "7.0.5",
+                "@iobroker/db-objects-file": "7.0.6",
+                "@iobroker/db-objects-jsonl": "7.0.6",
+                "@iobroker/db-objects-redis": "7.0.6",
+                "@iobroker/db-states-file": "7.0.6",
+                "@iobroker/db-states-jsonl": "7.0.6",
+                "@iobroker/db-states-redis": "7.0.6",
+                "@iobroker/js-controller-common-db": "7.0.6",
                 "fs-extra": "^11.1.0",
                 "jszip": "^3.10.1"
             },
@@ -4432,9 +4432,9 @@
             }
         },
         "node_modules/@iobroker/js-controller-common-db": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common-db/-/js-controller-common-db-7.0.5.tgz",
-            "integrity": "sha512-d4Iug8Oei0I0+gVvVqs5nzTZFS91UzCYtSXM7QFennkPnuYGgC7xV7Nqu6cm2ABm3uICr2VFKWmtyu0O5Ze8gg==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common-db/-/js-controller-common-db-7.0.6.tgz",
+            "integrity": "sha512-36eTg6RP43hCF7MirjjMSFu61sqZh4MOpj64uaETSKZcjwrhV5QWztdeJXB72H9b5yqo880m5wtNXLEW/FQjbw==",
             "license": "MIT",
             "dependencies": {
                 "@alcalzone/pak": "^0.8.1",
@@ -4591,10 +4591,11 @@
             }
         },
         "node_modules/@iobroker/types": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/@iobroker/types/-/types-7.0.5.tgz",
-            "integrity": "sha512-RR72kGAJrojLDxBP6US297oJ8tiVfW/BPljpiTGKKbFy7y3lhSawgQalj/tBlYgvIxzg0T0vKwbhZhmSdNnjXg==",
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/types/-/types-6.0.11.tgz",
+            "integrity": "sha512-RNDURjtL5Cm9wt6ocCqdRi86Qx1350zBIvvrJ9+Fjgasoi6cWCdoOghkwEeb95TH2j//q/uLqWwL8SZ0vxx6Kw==",
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=12.0.0"
             }
@@ -5397,9 +5398,9 @@
             }
         },
         "node_modules/@mui/core-downloads-tracker": {
-            "version": "6.1.10",
-            "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.10.tgz",
-            "integrity": "sha512-LY5wdiLCBDY7u+Od8UmFINZFGN/5ZU90fhAslf/ZtfP+5RhuY45f679pqYIxe0y54l6Gkv9PFOc8Cs10LDTBYg==",
+            "version": "6.1.9",
+            "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.9.tgz",
+            "integrity": "sha512-TWqj7b1w5cmSz4H/uf+y2AHxAH4ldPR7D2bz0XVyn60GCAo/zRbRPx7cF8gTs/i7CiYeHzV6dtat0VpMwOtolw==",
             "license": "MIT",
             "funding": {
                 "type": "opencollective",
@@ -5407,9 +5408,9 @@
             }
         },
         "node_modules/@mui/icons-material": {
-            "version": "6.1.10",
-            "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.1.10.tgz",
-            "integrity": "sha512-G6P1BCSt6EQDcKca47KwvKjlqgOXFbp2I3oWiOlFgKYTANBH89yk7ttMQ5ysqNxSYAB+4TdM37MlPYp4+FkVrQ==",
+            "version": "6.1.9",
+            "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.1.9.tgz",
+            "integrity": "sha512-AzlhIT51rdjkZ/EcUV2dbhNkNSUHIqCnNoUxodpiTw8buyAUBd+qnxg5OBSuPpun/ZEdSSB8Q7Uyh6zqjiMsEQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.26.0"
@@ -5422,7 +5423,7 @@
                 "url": "https://opencollective.com/mui-org"
             },
             "peerDependencies": {
-                "@mui/material": "^6.1.10",
+                "@mui/material": "^6.1.9",
                 "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
             },
@@ -5433,16 +5434,16 @@
             }
         },
         "node_modules/@mui/material": {
-            "version": "6.1.10",
-            "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.1.10.tgz",
-            "integrity": "sha512-txnwYObY4N9ugv5T2n5h1KcbISegZ6l65w1/7tpSU5OB6MQCU94YkP8n/3slDw2KcEfRk4+4D8EUGfhSPMODEQ==",
+            "version": "6.1.9",
+            "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.1.9.tgz",
+            "integrity": "sha512-NwqIN0bdsgzSbZd5JFcC+2ez0XW/XNs8uiV2PDHrqQ4qf/FEasFJG1z6g8JbCN0YlTrHZekVb17X0Fv0qcYJfQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.26.0",
-                "@mui/core-downloads-tracker": "^6.1.10",
-                "@mui/system": "^6.1.10",
+                "@mui/core-downloads-tracker": "^6.1.9",
+                "@mui/system": "^6.1.9",
                 "@mui/types": "^7.2.19",
-                "@mui/utils": "^6.1.10",
+                "@mui/utils": "^6.1.9",
                 "@popperjs/core": "^2.11.8",
                 "@types/react-transition-group": "^4.4.11",
                 "clsx": "^2.1.1",
@@ -5461,7 +5462,7 @@
             "peerDependencies": {
                 "@emotion/react": "^11.5.0",
                 "@emotion/styled": "^11.3.0",
-                "@mui/material-pigment-css": "^6.1.10",
+                "@mui/material-pigment-css": "^6.1.9",
                 "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
                 "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -5482,13 +5483,13 @@
             }
         },
         "node_modules/@mui/private-theming": {
-            "version": "6.1.10",
-            "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.1.10.tgz",
-            "integrity": "sha512-DqgsH0XFEweeG3rQfVkqTkeXcj/E76PGYWag8flbPdV8IYdMo+DfVdFlZK8JEjsaIVD2Eu1kJg972XnH5pfnBQ==",
+            "version": "6.1.9",
+            "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.1.9.tgz",
+            "integrity": "sha512-7aum/O1RquBYhfwL/7egDyl9GqJgPM6hoJDFFBbhF6Sgv9yI9v4w3ArKUkuVvR0CtVj4NXRVMKEioh1bjUzvuA==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.26.0",
-                "@mui/utils": "^6.1.10",
+                "@mui/utils": "^6.1.9",
                 "prop-types": "^15.8.1"
             },
             "engines": {
@@ -5509,9 +5510,9 @@
             }
         },
         "node_modules/@mui/styled-engine": {
-            "version": "6.1.10",
-            "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.1.10.tgz",
-            "integrity": "sha512-+NV9adKZYhslJ270iPjf2yzdVJwav7CIaXcMlPSi1Xy1S/zRe5xFgZ6BEoMdmGRpr34lIahE8H1acXP2myrvRw==",
+            "version": "6.1.9",
+            "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.1.9.tgz",
+            "integrity": "sha512-xynSLlJRxHLzSfQaiDjkaTx8LiFb9ByVa7aOdwFnTxGWFMY1F+mkXwAUY4jDDE+MAxkWxlzzQE0wOohnsxhdQg==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.26.0",
@@ -5543,16 +5544,16 @@
             }
         },
         "node_modules/@mui/system": {
-            "version": "6.1.10",
-            "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.1.10.tgz",
-            "integrity": "sha512-5YNIqxETR23SIkyP7MY2fFnXmplX/M4wNi2R+10AVRd3Ub+NLctWY/Vs5vq1oAMF0eSDLhRTGUjaUe+IGSfWqg==",
+            "version": "6.1.9",
+            "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.1.9.tgz",
+            "integrity": "sha512-8x+RucnNp21gfFYsklCaZf0COXbv3+v0lrVuXONxvPEkESi2rwLlOi8UPJfcz6LxZOAX3v3oQ7qw18vnpgueRg==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.26.0",
-                "@mui/private-theming": "^6.1.10",
-                "@mui/styled-engine": "^6.1.10",
+                "@mui/private-theming": "^6.1.9",
+                "@mui/styled-engine": "^6.1.9",
                 "@mui/types": "^7.2.19",
-                "@mui/utils": "^6.1.10",
+                "@mui/utils": "^6.1.9",
                 "clsx": "^2.1.1",
                 "csstype": "^3.1.3",
                 "prop-types": "^15.8.1"
@@ -5597,9 +5598,9 @@
             }
         },
         "node_modules/@mui/utils": {
-            "version": "6.1.10",
-            "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.1.10.tgz",
-            "integrity": "sha512-1ETuwswGjUiAf2dP9TkBy8p49qrw2wXa+RuAjNTRE5+91vtXJ1HKrs7H9s8CZd1zDlQVzUcUAPm9lpQwF5ogTw==",
+            "version": "6.1.9",
+            "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.1.9.tgz",
+            "integrity": "sha512-N7uzBp7p2or+xanXn3aH2OTINC6F/Ru/U8h6amhRZEev8bJhKN86rIDIoxZZ902tj+09LXtH83iLxFMjMHyqNA==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.26.0",
@@ -6830,16 +6831,16 @@
             }
         },
         "node_modules/@puppeteer/browsers": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.5.0.tgz",
-            "integrity": "sha512-6TQAc/5uRILE6deixJ1CR8rXyTbzXIXNgO1D0Woi9Bqicz2FV5iKP3BHYEg6o4UATCMcbQQ0jbmeaOkn/HQk2w==",
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.6.1.tgz",
+            "integrity": "sha512-aBSREisdsGH890S2rQqK82qmQYU3uFpSH8wcZWHgHzl3LfzsxAKbLNiAG9mO8v1Y0UICBeClICxPJvyr0rcuxg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "debug": "^4.3.7",
+                "debug": "^4.4.0",
                 "extract-zip": "^2.0.1",
                 "progress": "^2.0.3",
-                "proxy-agent": "^6.4.0",
+                "proxy-agent": "^6.5.0",
                 "semver": "^7.6.3",
                 "tar-fs": "^3.0.6",
                 "unbzip2-stream": "^1.4.3",
@@ -6997,75 +6998,75 @@
             "license": "MIT"
         },
         "node_modules/@sentry-internal/browser-utils": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.42.0.tgz",
-            "integrity": "sha512-xzgRI0wglKYsPrna574w1t38aftuvo44gjOKFvPNGPnYfiW9y4m+64kUz3JFbtanvOrKPcaITpdYiB4DeJXEbA==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.43.0.tgz",
+            "integrity": "sha512-5WhJZ3SA5sZVDBwOsChDd5JCzYcwBX7sEqBqEcm3pFru6TUihEnFIJmDIbreIyrQMwUhs3dTxnfnidgjr5z1Ag==",
             "license": "MIT",
             "dependencies": {
-                "@sentry/core": "8.42.0"
+                "@sentry/core": "8.43.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry-internal/feedback": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.42.0.tgz",
-            "integrity": "sha512-dkIw5Wdukwzngg5gNJ0QcK48LyJaMAnBspqTqZ3ItR01STi6Z+6+/Bt5XgmrvDgRD+FNBinflc5zMmfdFXXhvw==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.43.0.tgz",
+            "integrity": "sha512-rcGR2kzFu4vLXBQbI9eGJwjyToyjl36O2q/UKbiZBNJ5IFtDvKRLke6jIHq/YqiHPfFGpVtq5M/lYduDfA/eaQ==",
             "license": "MIT",
             "dependencies": {
-                "@sentry/core": "8.42.0"
+                "@sentry/core": "8.43.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry-internal/replay": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.42.0.tgz",
-            "integrity": "sha512-oNcJEBlDfXnRFYC5Mxj5fairyZHNqlnU4g8kPuztB9G5zlsyLgWfPxzcn1ixVQunth2/WZRklDi4o1ZfyHww7w==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.43.0.tgz",
+            "integrity": "sha512-geV5/zejLfGGwWHjylzrb1w8NI3U37GMG9/53nmv13FmTXUDF5XF2lh41KXFVYwvp7Ha4bd1FRQ9IU9YtBWskw==",
             "license": "MIT",
             "dependencies": {
-                "@sentry-internal/browser-utils": "8.42.0",
-                "@sentry/core": "8.42.0"
+                "@sentry-internal/browser-utils": "8.43.0",
+                "@sentry/core": "8.43.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry-internal/replay-canvas": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.42.0.tgz",
-            "integrity": "sha512-XrPErqVhPsPh/oFLVKvz7Wb+Fi2J1zCPLeZCxWqFuPWI2agRyLVu0KvqJyzSpSrRAEJC/XFzuSVILlYlXXSfgA==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.43.0.tgz",
+            "integrity": "sha512-rL8G7E1GtozH8VNalRrBQNjYDJ5ChWS/vpQI5hUG11PZfvQFXEVatLvT3uO2l0xIlHm4idTsHOSLTe/usxnogQ==",
             "license": "MIT",
             "dependencies": {
-                "@sentry-internal/replay": "8.42.0",
-                "@sentry/core": "8.42.0"
+                "@sentry-internal/replay": "8.43.0",
+                "@sentry/core": "8.43.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry/browser": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.42.0.tgz",
-            "integrity": "sha512-lStrEk609KJHwXfDrOgoYVVoFFExixHywxSExk7ZDtwj2YPv6r6Y1gogvgr7dAZj7jWzadHkxZ33l9EOSJBfug==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.43.0.tgz",
+            "integrity": "sha512-LGvLLnfmR8+AEgFmd7Q7KHiOTiV0P1Lvio2ENDELhEqJOIiICauttibVmig+AW02qg4kMeywvleMsUYaZv2RVA==",
             "license": "MIT",
             "dependencies": {
-                "@sentry-internal/browser-utils": "8.42.0",
-                "@sentry-internal/feedback": "8.42.0",
-                "@sentry-internal/replay": "8.42.0",
-                "@sentry-internal/replay-canvas": "8.42.0",
-                "@sentry/core": "8.42.0"
+                "@sentry-internal/browser-utils": "8.43.0",
+                "@sentry-internal/feedback": "8.43.0",
+                "@sentry-internal/replay": "8.43.0",
+                "@sentry-internal/replay-canvas": "8.43.0",
+                "@sentry/core": "8.43.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry/core": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.42.0.tgz",
-            "integrity": "sha512-ac6O3pgoIbU6rpwz6LlwW0wp3/GAHuSI0C5IsTgIY6baN8rOBnlAtG6KrHDDkGmUQ2srxkDJu9n1O6Td3cBCqw==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.43.0.tgz",
+            "integrity": "sha512-ktyovtjkTMNud+kC/XfqHVCoQKreIKgx/hgeRvzPwuPyd1t1KzYmRL3DBkbcWVnyOPpVTHn+RsEI1eRcVYHtvw==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.18"
@@ -21998,9 +21999,9 @@
             }
         },
         "node_modules/debug": {
-            "version": "4.3.7",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-            "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+            "version": "4.4.0",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -38205,18 +38206,18 @@
             }
         },
         "node_modules/puppeteer": {
-            "version": "23.10.1",
-            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.10.1.tgz",
-            "integrity": "sha512-kbcO+vu91fgUyBzEwByPe4q5lEEuBq4cuOZnZeRL42G7r5UrfbUFlxBJayXBLBsD6pREdk/92ZFwFQq3MaN6ww==",
+            "version": "23.10.3",
+            "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.10.3.tgz",
+            "integrity": "sha512-ODG+L9vCSPkQ1j+yDtNDdkSsWt2NXNrQO5C8MlwkYgE2hYnXdqVRbBpsHnoP7+EULJJKbWyR2Q4BdfohjQor3A==",
             "dev": true,
             "hasInstallScript": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@puppeteer/browsers": "2.5.0",
+                "@puppeteer/browsers": "2.6.1",
                 "chromium-bidi": "0.8.0",
                 "cosmiconfig": "^9.0.0",
                 "devtools-protocol": "0.0.1367902",
-                "puppeteer-core": "23.10.1",
+                "puppeteer-core": "23.10.3",
                 "typed-query-selector": "^2.12.0"
             },
             "bin": {
@@ -38227,15 +38228,15 @@
             }
         },
         "node_modules/puppeteer-core": {
-            "version": "23.10.1",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.10.1.tgz",
-            "integrity": "sha512-ey6NwixHYEUnhCA/uYi7uQQ4a0CZw4k+MatbHXGl5GEzaiRQziYUxc2HGpdQZ/gnh4KQWAKkocyIg1/dIm5d0g==",
+            "version": "23.10.3",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.10.3.tgz",
+            "integrity": "sha512-7JG8klL2qHLyH8t2pOmM9zgykhaulUf7cxnmmqupjdwGfNMiGaYehQka20iUB9R/fwVyG8mFMZcsmw1FHrgKVw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@puppeteer/browsers": "2.5.0",
+                "@puppeteer/browsers": "2.6.1",
                 "chromium-bidi": "0.8.0",
-                "debug": "^4.3.7",
+                "debug": "^4.4.0",
                 "devtools-protocol": "0.0.1367902",
                 "typed-query-selector": "^2.12.0",
                 "ws": "^8.18.0"
@@ -47031,13 +47032,13 @@
             "dependencies": {
                 "@emotion/react": "^11.13.5",
                 "@emotion/styled": "^11.13.5",
-                "@iobroker/js-controller-common": "^7.0.5",
-                "@iobroker/js-controller-common-db": "^7.0.5",
+                "@iobroker/js-controller-common": "^7.0.6",
+                "@iobroker/js-controller-common-db": "^7.0.6",
                 "@iobroker/socket-client": "^3.1.3",
-                "@iobroker/types": "^7.0.5",
-                "@mui/icons-material": "^6.1.10",
-                "@mui/material": "^6.1.10",
-                "@sentry/browser": "^8.42.0",
+                "@iobroker/types": "^7.0.6",
+                "@mui/icons-material": "^6.1.9",
+                "@mui/material": "^6.1.9",
+                "@sentry/browser": "^8.43.0",
                 "cronstrue": "^2.52.0",
                 "react-color": "^2.19.3",
                 "react-colorful": "^5.6.1",
@@ -47064,6 +47065,15 @@
                 "@rollup/rollup-linux-x64-gnu": "*"
             }
         },
+        "packages/adapter-react-v5/node_modules/@iobroker/types": {
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/@iobroker/types/-/types-7.0.6.tgz",
+            "integrity": "sha512-hCAw/ICjxQ48cIAVBvBAkj2NMkBkYILNFsPLH5yhcAH+B57SldS/2uz37+8i+dFzn4GlMXC7X04flJK02kyIdw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
         "packages/admin": {
             "name": "iobroker.admin",
             "version": "7.4.4",
@@ -48046,7 +48056,7 @@
         },
         "packages/admin/src-admin": {
             "name": "src-rx",
-            "version": "7.4.3",
+            "version": "7.4.4",
             "dev": true,
             "dependencies": {
                 "@iobroker/adapter-react-v5": "file:../../adapter-react-v5",
diff --git a/packages/adapter-react-v5/package.json b/packages/adapter-react-v5/package.json
index c3345c7a7..915643acc 100644
--- a/packages/adapter-react-v5/package.json
+++ b/packages/adapter-react-v5/package.json
@@ -56,13 +56,13 @@
     "dependencies": {
         "@emotion/react": "^11.13.5",
         "@emotion/styled": "^11.13.5",
-        "@iobroker/js-controller-common": "^7.0.5",
-        "@iobroker/js-controller-common-db": "^7.0.5",
+        "@iobroker/js-controller-common": "^7.0.6",
+        "@iobroker/js-controller-common-db": "^7.0.6",
         "@iobroker/socket-client": "^3.1.3",
-        "@iobroker/types": "^7.0.5",
-        "@mui/icons-material": "^6.1.10",
-        "@mui/material": "^6.1.10",
-        "@sentry/browser": "^8.42.0",
+        "@iobroker/types": "^7.0.6",
+        "@mui/icons-material": "^6.1.9",
+        "@mui/material": "^6.1.9",
+        "@sentry/browser": "^8.43.0",
         "cronstrue": "^2.52.0",
         "react-color": "^2.19.3",
         "react-colorful": "^5.6.1",
diff --git a/packages/adapter-react-v5/src/Components/Utils.tsx b/packages/adapter-react-v5/src/Components/Utils.tsx
index f8283d581..8445a0991 100644
--- a/packages/adapter-react-v5/src/Components/Utils.tsx
+++ b/packages/adapter-react-v5/src/Components/Utils.tsx
@@ -787,9 +787,10 @@ export class Utils {
                     );
                 }
 
-                m = text ? text.match(/<a [^<]+<\/a>|<br\/?>|<b>[^<]+<\/b>|<i>[^<]+<\/i>/) : null;
-                if (!m) {
-                    text && result.push(<span key={`a${key++}`}>{text}</span>);
+                m = text ? text.match(/<a [^<]+<\/a>|<br\s?\/?>|<b>[^<]+<\/b>|<i>[^<]+<\/i>/) : null;
+                if (!m && text) {
+                    // put the rest text
+                    result.push(<span key={`a${key++}`}>{text}</span>);
                 }
             } while (m);
 

From 7396edfa8e1fe0aa32a9c2342f6ee6215ebbf22a Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Tue, 10 Dec 2024 22:36:31 +0000
Subject: [PATCH 03/15] Corrected news dialog

---
 README.md                                     |   1 +
 package-lock.json                             | 544 +++++++-----------
 packages/adapter-react-v5/package.json        |   6 +-
 packages/admin/src-admin/src/App.tsx          |  18 +-
 .../src/components/Object/ObjectChart.tsx     |   2 +
 .../components/Object/ObjectHistoryData.tsx   |   2 +
 .../SystemSettingsTabs/MainSettingsDialog.tsx |   2 +
 .../SystemSettingsTabs/RepositoriesDialog.tsx |   1 +
 packages/admin/src/lib/web.ts                 |   1 +
 packages/admin/src/main.ts                    |   1 +
 .../dm-gui-components/src/Communication.tsx   |  12 +-
 11 files changed, 249 insertions(+), 341 deletions(-)

diff --git a/README.md b/README.md
index c4351fecd..9dbb6e3d9 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,7 @@ The icons may not be reused in other projects without the proper flaticon licens
 ### **WORK IN PROGRESS**
 
 -   (@GermanBluefox) Corrected the rendering of custom JSON config components
+-   (@GermanBluefox) Corrected the news dialog for multi-line messages
 
 ### 7.4.4 (2024-12-08)
 
diff --git a/package-lock.json b/package-lock.json
index 07eb8ad80..3523e80a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4215,153 +4215,6 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "node_modules/@iobroker/db-base": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-base/-/db-base-7.0.6.tgz",
-            "integrity": "sha512-+zXsJ7pw9AlSnD91zlDbEosfvGRtI7DwxXr2bD0kMINZpmFOJLPxdVRe1OVjOMc2+ohyibDliwqNzGyVCFkuyw==",
-            "license": "MIT",
-            "dependencies": {
-                "@iobroker/js-controller-common-db": "7.0.6",
-                "deep-clone": "^3.0.3",
-                "fs-extra": "^11.1.0",
-                "respjs": "^4.2.0"
-            },
-            "engines": {
-                "node": ">=18.0.0"
-            }
-        },
-        "node_modules/@iobroker/db-base/node_modules/fs-extra": {
-            "version": "11.2.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
-        "node_modules/@iobroker/db-objects-file": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-file/-/db-objects-file-7.0.6.tgz",
-            "integrity": "sha512-Gph6eeimucIJzY4HxFZmXYx9hvvqLhC3wkPQm+w59n4jA+o5OcYWeHIBNgPJpJTjJSukhUlJAA22jWbZy+qQAw==",
-            "license": "Apache 2.0",
-            "dependencies": {
-                "@iobroker/db-base": "7.0.6",
-                "@iobroker/db-objects-redis": "7.0.6",
-                "deep-clone": "^3.0.3",
-                "fs-extra": "^11.1.0"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
-        "node_modules/@iobroker/db-objects-file/node_modules/fs-extra": {
-            "version": "11.2.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
-        "node_modules/@iobroker/db-objects-jsonl": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-jsonl/-/db-objects-jsonl-7.0.6.tgz",
-            "integrity": "sha512-Kb9iW7IlK/8fm97P2TRunI/JaPWHFQesHKRPEqq696EFtLqozQMr5CwxRjrseYXFoUAk47zALjUPnPdG9dAldw==",
-            "license": "Apache 2.0",
-            "dependencies": {
-                "@alcalzone/jsonl-db": "~3.1.1",
-                "@iobroker/db-base": "7.0.6",
-                "@iobroker/db-objects-file": "7.0.6",
-                "@iobroker/db-objects-redis": "7.0.6",
-                "deep-clone": "^3.0.3",
-                "fs-extra": "^11.1.0"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
-        "node_modules/@iobroker/db-objects-jsonl/node_modules/fs-extra": {
-            "version": "11.2.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
-        "node_modules/@iobroker/db-objects-redis": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-redis/-/db-objects-redis-7.0.6.tgz",
-            "integrity": "sha512-BPUP5MgzxNwJCkkDhVXLNAccREOcikhNVI5DcRzrZ3j4yRbKOfjro1/Wu5/nudBMNI4pmUDP/rwE7IbfUPaV2A==",
-            "license": "Apache 2.0",
-            "dependencies": {
-                "@iobroker/db-base": "7.0.6",
-                "deep-clone": "^3.0.3",
-                "ioredis": "^4.28.2",
-                "mime-types": "^2.1.35",
-                "node.extend": "^2.0.2",
-                "semver": "^7.5.2"
-            },
-            "engines": {
-                "node": ">=16.4.0"
-            }
-        },
-        "node_modules/@iobroker/db-states-file": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-states-file/-/db-states-file-7.0.6.tgz",
-            "integrity": "sha512-MIFlOVLd9emgAoWR+vq5B+A68+YxOCGLkN7RPxQw2kUO1pomK3USrbLF4ReCFtM8GLZI/HhaT5Q+a9FBYU1+2w==",
-            "license": "MIT",
-            "dependencies": {
-                "@iobroker/db-base": "7.0.6",
-                "@iobroker/db-states-redis": "7.0.6"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
-        "node_modules/@iobroker/db-states-jsonl": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-states-jsonl/-/db-states-jsonl-7.0.6.tgz",
-            "integrity": "sha512-KBPxXo7Z+/l9kWZBrhmNQTYALPssIzsYJ4w1qB2EbQlrlklAQV7Aodf4g+M+/pkzy7aq9BVwvzksr/yhIk1BxQ==",
-            "license": "MIT",
-            "dependencies": {
-                "@alcalzone/jsonl-db": "~3.1.1",
-                "@iobroker/db-base": "7.0.6",
-                "@iobroker/db-states-file": "7.0.6",
-                "@iobroker/db-states-redis": "7.0.6"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
-        "node_modules/@iobroker/db-states-redis": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/db-states-redis/-/db-states-redis-7.0.6.tgz",
-            "integrity": "sha512-HQbAzJ6Q11U9pkO4h+mI8J08D9O1IpPcGeQGDjptJOKNzQMeQ2fvTc+N+n+vtiEy/PBanNADXsi9frbcyWqWGg==",
-            "license": "MIT",
-            "dependencies": {
-                "@iobroker/db-base": "7.0.6",
-                "ioredis": "^4.28.2"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
         "node_modules/@iobroker/dm-gui-components": {
             "resolved": "packages/dm-gui-components",
             "link": true
@@ -4407,124 +4260,6 @@
                 "node": ">=16"
             }
         },
-        "node_modules/@iobroker/js-controller-common": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common/-/js-controller-common-7.0.6.tgz",
-            "integrity": "sha512-W/R37U1DuR6wxdbCp0ZWdmnQiGXVTCjrOcPKysd2kABQ/wWwOuaUrtllLaB9aPzNGE7WCRqvo26U18Vm2U7fSg==",
-            "license": "MIT",
-            "dependencies": {
-                "@iobroker/db-objects-file": "7.0.6",
-                "@iobroker/db-objects-jsonl": "7.0.6",
-                "@iobroker/db-objects-redis": "7.0.6",
-                "@iobroker/db-states-file": "7.0.6",
-                "@iobroker/db-states-jsonl": "7.0.6",
-                "@iobroker/db-states-redis": "7.0.6",
-                "@iobroker/js-controller-common-db": "7.0.6",
-                "fs-extra": "^11.1.0",
-                "jszip": "^3.10.1"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            },
-            "optionalDependencies": {
-                "winston-seq-updated": "^1.0.4",
-                "winston-syslog": "^2.6.0"
-            }
-        },
-        "node_modules/@iobroker/js-controller-common-db": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common-db/-/js-controller-common-db-7.0.6.tgz",
-            "integrity": "sha512-36eTg6RP43hCF7MirjjMSFu61sqZh4MOpj64uaETSKZcjwrhV5QWztdeJXB72H9b5yqo880m5wtNXLEW/FQjbw==",
-            "license": "MIT",
-            "dependencies": {
-                "@alcalzone/pak": "^0.8.1",
-                "axios": "^1.7.4",
-                "ci-info": "^3.8.0",
-                "deep-clone": "^3.0.3",
-                "event-stream": "^4.0.1",
-                "fs-extra": "^11.1.0",
-                "jsonwebtoken": "^9.0.0",
-                "node-forge": "^1.3.0",
-                "node.extend": "^2.0.2",
-                "promisify-child-process": "^4.1.2",
-                "readline": "^1.3.0",
-                "semver": "^7.5.2",
-                "triple-beam": "^1.3.0",
-                "winston": "^3.7.2",
-                "winston-daily-rotate-file": "^5.0.0",
-                "winston-transport": "^4.5.0"
-            },
-            "engines": {
-                "node": ">=18.0.0"
-            },
-            "optionalDependencies": {
-                "@datalust/winston-seq": "^1.0.0",
-                "diskusage": "^1.1.3",
-                "winston-syslog": "^2.6.0"
-            }
-        },
-        "node_modules/@iobroker/js-controller-common-db/node_modules/@alcalzone/pak": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.8.1.tgz",
-            "integrity": "sha512-sPdxNxdXLH96kbyWLdIljVSIY2N6/qnPqkq5AlWvuizjGQUwHIUtWZHLss9XNDV/hY7YkgdIb9ILHbMTnRBxVQ==",
-            "license": "MIT",
-            "dependencies": {
-                "axios": "^0.26.0",
-                "execa": "^5.0.0",
-                "fs-extra": "^10.0.1"
-            }
-        },
-        "node_modules/@iobroker/js-controller-common-db/node_modules/@alcalzone/pak/node_modules/axios": {
-            "version": "0.26.1",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-            "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
-            "license": "MIT",
-            "dependencies": {
-                "follow-redirects": "^1.14.8"
-            }
-        },
-        "node_modules/@iobroker/js-controller-common-db/node_modules/@alcalzone/pak/node_modules/fs-extra": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/@iobroker/js-controller-common-db/node_modules/fs-extra": {
-            "version": "11.2.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
-        "node_modules/@iobroker/js-controller-common/node_modules/fs-extra": {
-            "version": "11.2.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
         "node_modules/@iobroker/json-config": {
             "resolved": "packages/jsonConfig",
             "link": true
@@ -27768,12 +27503,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/immediate": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-            "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
-            "license": "MIT"
-        },
         "node_modules/immer": {
             "version": "9.0.21",
             "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
@@ -31270,48 +30999,6 @@
                 "node": ">=4.0"
             }
         },
-        "node_modules/jszip": {
-            "version": "3.10.1",
-            "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
-            "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
-            "license": "(MIT OR GPL-3.0-or-later)",
-            "dependencies": {
-                "lie": "~3.3.0",
-                "pako": "~1.0.2",
-                "readable-stream": "~2.3.6",
-                "setimmediate": "^1.0.5"
-            }
-        },
-        "node_modules/jszip/node_modules/readable-stream": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-            "license": "MIT",
-            "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-            }
-        },
-        "node_modules/jszip/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "license": "MIT"
-        },
-        "node_modules/jszip/node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "license": "MIT",
-            "dependencies": {
-                "safe-buffer": "~5.1.0"
-            }
-        },
         "node_modules/just-diff": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz",
@@ -31833,15 +31520,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/lie": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
-            "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-            "license": "MIT",
-            "dependencies": {
-                "immediate": "~3.0.5"
-            }
-        },
         "node_modules/lilconfig": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -35538,7 +35216,9 @@
             "version": "1.0.11",
             "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
             "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-            "license": "(MIT AND Zlib)"
+            "dev": true,
+            "license": "(MIT AND Zlib)",
+            "peer": true
         },
         "node_modules/parallel-transform": {
             "version": "1.2.0",
@@ -40959,7 +40639,9 @@
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
             "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
-            "license": "MIT"
+            "dev": true,
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/setprototypeof": {
             "version": "1.2.0",
@@ -47032,10 +46714,10 @@
             "dependencies": {
                 "@emotion/react": "^11.13.5",
                 "@emotion/styled": "^11.13.5",
-                "@iobroker/js-controller-common": "^7.0.6",
-                "@iobroker/js-controller-common-db": "^7.0.6",
+                "@iobroker/js-controller-common": "^6.0.11",
+                "@iobroker/js-controller-common-db": "^6.0.11",
                 "@iobroker/socket-client": "^3.1.3",
-                "@iobroker/types": "^7.0.6",
+                "@iobroker/types": "^6.0.11",
                 "@mui/icons-material": "^6.1.9",
                 "@mui/material": "^6.1.9",
                 "@sentry/browser": "^8.43.0",
@@ -47065,6 +46747,200 @@
                 "@rollup/rollup-linux-x64-gnu": "*"
             }
         },
+        "packages/adapter-react-v5/node_modules/@alcalzone/pak": {
+            "version": "0.8.1",
+            "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.8.1.tgz",
+            "integrity": "sha512-sPdxNxdXLH96kbyWLdIljVSIY2N6/qnPqkq5AlWvuizjGQUwHIUtWZHLss9XNDV/hY7YkgdIb9ILHbMTnRBxVQ==",
+            "license": "MIT",
+            "dependencies": {
+                "axios": "^0.26.0",
+                "execa": "^5.0.0",
+                "fs-extra": "^10.0.1"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@alcalzone/pak/node_modules/axios": {
+            "version": "0.26.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+            "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+            "license": "MIT",
+            "dependencies": {
+                "follow-redirects": "^1.14.8"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@alcalzone/pak/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/db-base": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-base/-/db-base-6.0.11.tgz",
+            "integrity": "sha512-WImlfdwr0O5+sQOQkI9zaScB4UFNuIGXs+K+5bL4+f1yJIPIuFU+njBDI7vUz6zoE+cLGkQRqNxwh6wfMVxBuQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@iobroker/js-controller-common-db": "6.0.11",
+                "deep-clone": "^3.0.3",
+                "fs-extra": "^11.1.0",
+                "respjs": "^4.2.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/db-objects-file": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-file/-/db-objects-file-6.0.11.tgz",
+            "integrity": "sha512-MqCzDftazOj+IZQcfviaG7xUTdIuILjrjmf2wXSbFYsZbnK5zDhm4wxnWPT+dVrPBWnqWJ3aAzhhaq6I3BQPqQ==",
+            "license": "Apache 2.0",
+            "dependencies": {
+                "@iobroker/db-base": "6.0.11",
+                "@iobroker/db-objects-redis": "6.0.11",
+                "deep-clone": "^3.0.3",
+                "fs-extra": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/db-objects-jsonl": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-jsonl/-/db-objects-jsonl-6.0.11.tgz",
+            "integrity": "sha512-DBPykrMKvx3mxPVB1U8HE6d8NbA5pSHYIEXq+b6/IgwLLGX+LmjSz5TNqmO5gaYA6a4z4kOg44F56SRrUBIgCg==",
+            "license": "Apache 2.0",
+            "dependencies": {
+                "@alcalzone/jsonl-db": "~3.1.1",
+                "@iobroker/db-base": "6.0.11",
+                "@iobroker/db-objects-file": "6.0.11",
+                "@iobroker/db-objects-redis": "6.0.11",
+                "deep-clone": "^3.0.3",
+                "fs-extra": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/db-objects-redis": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-objects-redis/-/db-objects-redis-6.0.11.tgz",
+            "integrity": "sha512-aOAcfG1iCWVilTkjhbTialP9BhYh+HrB1RwfIqF/56MMroKFCPMCi9E/zlrooNYWWAdN6EFb4DcIM4ZpQlXDVg==",
+            "license": "Apache 2.0",
+            "dependencies": {
+                "@iobroker/db-base": "6.0.11",
+                "deep-clone": "^3.0.3",
+                "ioredis": "^4.28.2",
+                "mime-types": "^2.1.35",
+                "node.extend": "^2.0.2",
+                "semver": "^7.5.2"
+            },
+            "engines": {
+                "node": ">=16.4.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/db-states-file": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-states-file/-/db-states-file-6.0.11.tgz",
+            "integrity": "sha512-K1tRuaqaIpwlpeo/z2btWTPKsILYM5jXf+8aw3AVCwULA328MbMpBBMreehliGGVTTIUoq25ZdcR/zLjYl2lJA==",
+            "license": "MIT",
+            "dependencies": {
+                "@iobroker/db-base": "6.0.11",
+                "@iobroker/db-states-redis": "6.0.11"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/db-states-jsonl": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-states-jsonl/-/db-states-jsonl-6.0.11.tgz",
+            "integrity": "sha512-Q06TvVLdfH+FPBo29CHLLIXeaOZXJ3tyImlp17mOr9wVqCr64sN6iZ+vsIe5Dd4j7nzg+pptR2il8TgAyJg8Yw==",
+            "license": "MIT",
+            "dependencies": {
+                "@alcalzone/jsonl-db": "~3.1.1",
+                "@iobroker/db-base": "6.0.11",
+                "@iobroker/db-states-file": "6.0.11",
+                "@iobroker/db-states-redis": "6.0.11"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/db-states-redis": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/db-states-redis/-/db-states-redis-6.0.11.tgz",
+            "integrity": "sha512-9/oiBfCMmPLDIj3IJSHF3TNbbksEOF1t6JlLSkPI0Vvs8WAE1C+dUb3VSq9FFKk9d6Fp00l8JObACPD01/AImg==",
+            "license": "MIT",
+            "dependencies": {
+                "@iobroker/db-base": "6.0.11",
+                "ioredis": "^4.28.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/js-controller-common": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common/-/js-controller-common-6.0.11.tgz",
+            "integrity": "sha512-VZH04ksSPADIltOQsy83PkQkaHhLEdCAnwOWJARrLWg6aGtl0DjAoQDl6DmgXErkDWurlRH73BdkfaVh5+TZQg==",
+            "license": "MIT",
+            "dependencies": {
+                "@iobroker/db-objects-file": "6.0.11",
+                "@iobroker/db-objects-jsonl": "6.0.11",
+                "@iobroker/db-objects-redis": "6.0.11",
+                "@iobroker/db-states-file": "6.0.11",
+                "@iobroker/db-states-jsonl": "6.0.11",
+                "@iobroker/db-states-redis": "6.0.11",
+                "@iobroker/js-controller-common-db": "6.0.11",
+                "fs-extra": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "optionalDependencies": {
+                "winston-seq-updated": "^1.0.4",
+                "winston-syslog": "^2.6.0"
+            }
+        },
+        "packages/adapter-react-v5/node_modules/@iobroker/js-controller-common-db": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/@iobroker/js-controller-common-db/-/js-controller-common-db-6.0.11.tgz",
+            "integrity": "sha512-7HhcEgK3qT6oKWF9U4a7RmruNyDvsxXf/YXWKuE2C4iuoOX5Q9dJDlYs1LP6t9eGGULaylVa06v5nK9xh0VCuA==",
+            "license": "MIT",
+            "dependencies": {
+                "@alcalzone/pak": "^0.8.1",
+                "axios": "^1.6.3",
+                "ci-info": "^3.8.0",
+                "deep-clone": "^3.0.3",
+                "event-stream": "^4.0.1",
+                "fs-extra": "^11.1.0",
+                "jsonwebtoken": "^9.0.0",
+                "node-forge": "^1.3.0",
+                "node.extend": "^2.0.2",
+                "promisify-child-process": "^4.1.2",
+                "readline": "^1.3.0",
+                "semver": "^7.5.2",
+                "triple-beam": "^1.3.0",
+                "winston": "^3.7.2",
+                "winston-daily-rotate-file": "^5.0.0",
+                "winston-transport": "^4.5.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "optionalDependencies": {
+                "@datalust/winston-seq": "^1.0.0",
+                "diskusage": "^1.1.3",
+                "winston-syslog": "^2.6.0"
+            }
+        },
         "packages/adapter-react-v5/node_modules/@iobroker/types": {
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/@iobroker/types/-/types-7.0.6.tgz",
@@ -47074,6 +46950,20 @@
                 "node": ">=12.0.0"
             }
         },
+        "packages/adapter-react-v5/node_modules/fs-extra": {
+            "version": "11.2.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
         "packages/admin": {
             "name": "iobroker.admin",
             "version": "7.4.4",
diff --git a/packages/adapter-react-v5/package.json b/packages/adapter-react-v5/package.json
index 915643acc..17fb01e5e 100644
--- a/packages/adapter-react-v5/package.json
+++ b/packages/adapter-react-v5/package.json
@@ -56,10 +56,10 @@
     "dependencies": {
         "@emotion/react": "^11.13.5",
         "@emotion/styled": "^11.13.5",
-        "@iobroker/js-controller-common": "^7.0.6",
-        "@iobroker/js-controller-common-db": "^7.0.6",
+        "@iobroker/js-controller-common": "^6.0.11",
+        "@iobroker/js-controller-common-db": "^6.0.11",
         "@iobroker/socket-client": "^3.1.3",
-        "@iobroker/types": "^7.0.6",
+        "@iobroker/types": "^6.0.11",
         "@mui/icons-material": "^6.1.9",
         "@mui/material": "^6.1.9",
         "@sentry/browser": "^8.43.0",
diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
index 50df31da6..e3fc2c3d8 100644
--- a/packages/admin/src-admin/src/App.tsx
+++ b/packages/admin/src-admin/src/App.tsx
@@ -1711,7 +1711,7 @@ class App extends Router<AppProps, AppState> {
         const repository: CompactRepository = await this.socket
             .getCompactRepository(currentHost, update, this.state.readTimeoutMs)
             .catch((e: unknown): CompactRepository => {
-                window.alert(`Cannot getRepositoryCompact: ${e}`);
+                window.alert(`Cannot getRepositoryCompact: ${e as Error}`);
                 if ((e as Error).toString().includes('timeout')) {
                     this.setState({ showSlowConnectionWarning: true });
                 }
@@ -1721,8 +1721,8 @@ class App extends Router<AppProps, AppState> {
         const installed: CompactInstalledInfo = await this.socket
             .getCompactInstalled(currentHost, update, this.state.readTimeoutMs)
             .catch((e: unknown): CompactInstalledInfo => {
-                window.alert(`Cannot getInstalled: ${e}`);
-                if (e.toString().includes('timeout')) {
+                window.alert(`Cannot getInstalled: ${e as Error}`);
+                if ((e as Error).toString().includes('timeout')) {
                     this.setState({ showSlowConnectionWarning: true });
                 }
                 return {} as CompactInstalledInfo;
@@ -2411,9 +2411,13 @@ class App extends Router<AppProps, AppState> {
         if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') {
             return (
                 <div>
-                    {this.state.systemConfig.common.siteName ? (
-                        <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
-                    ) : null}
+                    {
+                        // @ts-expect-error fixed in js-controller 7
+                        this.state.systemConfig.common.siteName ? (
+                            // @ts-expect-error fixed in js-controller 7
+                            <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
+                        ) : null
+                    }
 
                     <Box
                         component="div"
@@ -2456,7 +2460,9 @@ class App extends Router<AppProps, AppState> {
                 </div>
             );
         }
+        // @ts-expect-error fixed in js-controller 7
         if (this.props.width !== 'xs' && this.props.width !== 'sm' && this.state.systemConfig.common.siteName) {
+            // @ts-expect-error fixed in js-controller 7
             return <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>;
         }
         return null;
diff --git a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
index 191d037a8..87b2682d4 100644
--- a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
+++ b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
@@ -520,6 +520,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
                     from: false,
                     ack: false,
                     q: false,
+                    // @ts-expect-error fixed in js-controller 7
                     addId: false,
                     aggregate: 'none',
                 })
@@ -565,6 +566,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
             from: false,
             ack: false,
             q: false,
+            // @ts-expect-error fixed in js-controller 7
             addId: false,
             aggregate: 'none',
             returnNewestEntries: true,
diff --git a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
index 4a388a6fb..ffd987957 100644
--- a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
+++ b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
@@ -522,6 +522,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: true,
                 ack: true,
                 q: true,
+                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
                 returnNewestEntries: true,
@@ -633,6 +634,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: false,
                 ack: false,
                 q: false,
+                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
             })
diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
index 4d667b95a..0913e5c05 100644
--- a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
+++ b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
@@ -655,6 +655,7 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
                                     variant="standard"
                                     id="siteName"
                                     label={this.props.t('Site name')}
+                                    // @ts-expect-error Fixed in js-controller 7
                                     value={this.props.data.common.siteName || ''}
                                     onChange={e => this.doChange('siteName', e.target.value)}
                                     helperText={this.props.t(
@@ -662,6 +663,7 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
                                     )}
                                     slotProps={{
                                         input: {
+                                            // @ts-expect-error Fixed in js-controller 7
                                             endAdornment: this.props.data.common.siteName ? (
                                                 <InputAdornment position="end">
                                                     <IconButton
diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
index 8adab9ab4..5d739c9e3 100644
--- a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
+++ b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
@@ -459,6 +459,7 @@ class RepositoriesDialog extends BaseSystemSettingsDialog<RepositoriesDialogProp
                         <span>
                             <Checkbox
                                 disabled
+                                // @ts-expect-error Fixed in js-controller 7
                                 checked={this.props.repoInfo[item.title]?.stable}
                                 indeterminate={!this.props.repoInfo[item.title]}
                             />
diff --git a/packages/admin/src/lib/web.ts b/packages/admin/src/lib/web.ts
index f8a7013a6..4fdda8873 100644
--- a/packages/admin/src/lib/web.ts
+++ b/packages/admin/src/lib/web.ts
@@ -389,6 +389,7 @@ class Web {
             `system.adapter.${adapterName}`,
         );
 
+        // @ts-expect-error fixed in js-controller 7
         if (res?.common.adminUI?.config === 'json') {
             try {
                 const ajv = new Ajv({
diff --git a/packages/admin/src/main.ts b/packages/admin/src/main.ts
index 946f77e7c..8d2566492 100644
--- a/packages/admin/src/main.ts
+++ b/packages/admin/src/main.ts
@@ -1949,6 +1949,7 @@ class Admin extends Adapter {
             );
             this.changedPasswords.push(found);
 
+            // @ts-expect-error types defined in js-controller 7
             await this.registerNotification('admin', 'wellKnownPassword', I18n.translate('User: %s', found.login), {
                 contextData: {
                     admin: {
diff --git a/packages/dm-gui-components/src/Communication.tsx b/packages/dm-gui-components/src/Communication.tsx
index b0fa0b665..b7b61eea0 100644
--- a/packages/dm-gui-components/src/Communication.tsx
+++ b/packages/dm-gui-components/src/Communication.tsx
@@ -78,7 +78,7 @@ interface CommunicationForm {
     noTranslation?: boolean; // Do not translate title/label
     schema: JsonFormSchema;
     data?: Record<string, any>;
-    buttons?: (ActionButton | 'apply' | 'cancel')[];
+    buttons?: (ActionButton | 'apply' | 'cancel' | 'close')[];
     maxWidth?: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 }
 
@@ -520,7 +520,7 @@ class Communication<P extends CommunicationProps, S extends CommunicationState>
         );
     }
 
-    getOkButton(button?: ActionButton | 'apply' | 'cancel'): React.JSX.Element {
+    getOkButton(button?: ActionButton | 'apply' | 'cancel' | 'close'): React.JSX.Element {
         if (typeof button === 'string') {
             button = undefined;
         }
@@ -538,8 +538,10 @@ class Communication<P extends CommunicationProps, S extends CommunicationState>
         );
     }
 
-    getCancelButton(button?: ActionButton | 'apply' | 'cancel'): React.JSX.Element {
+    getCancelButton(button?: ActionButton | 'apply' | 'cancel' | 'close'): React.JSX.Element {
+        let isClose = false;
         if (typeof button === 'string') {
+            isClose = button === 'close';
             button = undefined;
         }
         return (
@@ -548,7 +550,7 @@ class Communication<P extends CommunicationProps, S extends CommunicationState>
                 variant={button?.variant || 'contained'}
                 color={button?.color || 'grey'}
                 onClick={() => this.state.form?.handleClose && this.state.form.handleClose()}
-                startIcon={button?.icon ? <Icon src={button?.icon} /> : undefined}
+                startIcon={isClose ? <Close /> : button?.icon ? <Icon src={button?.icon} /> : undefined}
             >
                 {getTranslation(button?.label || 'cancelButtonText', button?.noTranslation)}
             </Button>
@@ -562,7 +564,7 @@ class Communication<P extends CommunicationProps, S extends CommunicationState>
         let buttons: React.JSX.Element[];
         if (this.state.form.buttons) {
             buttons = [];
-            this.state.form.buttons.forEach((button: ActionButton | 'apply' | 'cancel'): void => {
+            this.state.form.buttons.forEach((button: ActionButton | 'apply' | 'cancel' | 'close'): void => {
                 if (button === 'apply' || (button as ActionButton).type === 'apply') {
                     buttons.push(this.getOkButton(button));
                 } else {

From d5bbb0bbde746849d50342dd281bbd423094dd6a Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 00:30:46 +0000
Subject: [PATCH 04/15] Trying to fix CI

---
 packages/admin/src-admin/src/App.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
index e3fc2c3d8..30ad55270 100644
--- a/packages/admin/src-admin/src/App.tsx
+++ b/packages/admin/src-admin/src/App.tsx
@@ -2411,13 +2411,9 @@ class App extends Router<AppProps, AppState> {
         if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') {
             return (
                 <div>
-                    {
-                        // @ts-expect-error fixed in js-controller 7
-                        this.state.systemConfig.common.siteName ? (
-                            // @ts-expect-error fixed in js-controller 7
-                            <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
-                        ) : null
-                    }
+                    {this.state.systemConfig.common.siteName ? (
+                        <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
+                    ) : null}
 
                     <Box
                         component="div"

From 235a035af6499e996d2a1df77155e312739f97de Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 08:03:17 +0000
Subject: [PATCH 05/15] Trying to fix CI

---
 packages/admin/src-admin/src/App.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
index 30ad55270..e041be171 100644
--- a/packages/admin/src-admin/src/App.tsx
+++ b/packages/admin/src-admin/src/App.tsx
@@ -2456,9 +2456,7 @@ class App extends Router<AppProps, AppState> {
                 </div>
             );
         }
-        // @ts-expect-error fixed in js-controller 7
         if (this.props.width !== 'xs' && this.props.width !== 'sm' && this.state.systemConfig.common.siteName) {
-            // @ts-expect-error fixed in js-controller 7
             return <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>;
         }
         return null;

From 8c052f0bd4d02afcb5f2f053034c94e9acddb634 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 09:12:57 +0000
Subject: [PATCH 06/15] Trying to fix CI

---
 .../Adapters/AdapterInstallDialog.tsx         | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/packages/admin/src-admin/src/components/Adapters/AdapterInstallDialog.tsx b/packages/admin/src-admin/src/components/Adapters/AdapterInstallDialog.tsx
index f782d65eb..89ed8716f 100644
--- a/packages/admin/src-admin/src/components/Adapters/AdapterInstallDialog.tsx
+++ b/packages/admin/src-admin/src/components/Adapters/AdapterInstallDialog.tsx
@@ -7,13 +7,60 @@ import { checkCondition, type CompactInstanceInfo } from '@/dialogs/AdapterUpdat
 
 import AddInstanceDialog, { type AdapterDependencies } from '@/dialogs/AddInstanceDialog';
 import LicenseDialog from '@/dialogs/LicenseDialog';
-import type { AdapterInformation } from '@iobroker/js-controller-common-db/build/esm/lib/common/tools';
+// import type { AdapterInformation } from '@iobroker/js-controller-common-db/build/esm/lib/common/tools';
 import type InstancesWorker from '@/Workers/InstancesWorker';
 import type HostsWorker from '@/Workers/HostsWorker';
 import type { RatingDialogRepository } from '@/dialogs/RatingDialog';
 import type HostAdapterWorker from '@/Workers/HostAdapterWorker';
 import { extractUrlLink, type RepoAdapterObject } from './Utils';
 
+// TODO: Placed here from @iobroker/js-controller-common-db/build/esm/lib/common/tools
+interface Multilingual {
+    en: string;
+    de?: string;
+    ru?: string;
+    pt?: string;
+    nl?: string;
+    fr?: string;
+    it?: string;
+    es?: string;
+    pl?: string;
+    uk?: string;
+    'zh-cn'?: string;
+}
+
+// TODO: Placed here from @iobroker/js-controller-common-db/build/esm/lib/common/tools
+export interface AdapterInformation {
+    /** this flag is only true for the js-controller */
+    controller: boolean;
+    /** adapter version */
+    version: string;
+    /** path to icon of the adapter */
+    icon: string;
+    /** path to local icon of the adapter */
+    localIcon?: string;
+    /** title of the adapter */
+    title: string;
+    /** title of the adapter in multiple languages */
+    titleLang: Multilingual;
+    /** description of the adapter in multiple languages */
+    desc: Multilingual;
+    /** platform of the adapter */
+    platform: 'Javascript/Node.js';
+    /** keywords of the adapter */
+    keywords: string[];
+    /** path to readme file */
+    readme: string;
+    /** The installed adapter version, not existing on controller */
+    runningVersion?: string;
+    /** type of the adapter */
+    type: string;
+    /** license of the adapter */
+    license: string;
+    /** url to license information */
+    licenseUrl?: string;
+}
+
 export type AdapterRating = {
     rating?: { r: number; c: number };
     [version: string]: { r: number; c: number };

From 3e40b8cc7b11b5710d0db7836d5d3c669ebd4b6f Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 10:01:08 +0000
Subject: [PATCH 07/15] Trying to fix CI

---
 packages/admin/src-admin/src/components/Object/ObjectChart.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
index 87b2682d4..191d037a8 100644
--- a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
+++ b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
@@ -520,7 +520,6 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
                     from: false,
                     ack: false,
                     q: false,
-                    // @ts-expect-error fixed in js-controller 7
                     addId: false,
                     aggregate: 'none',
                 })
@@ -566,7 +565,6 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
             from: false,
             ack: false,
             q: false,
-            // @ts-expect-error fixed in js-controller 7
             addId: false,
             aggregate: 'none',
             returnNewestEntries: true,

From 6f2251705dd3d627909df38f190f020a4ca1b3f8 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 13:36:15 +0000
Subject: [PATCH 08/15] Trying to fix CI

---
 .../admin/src-admin/src/components/Object/ObjectHistoryData.tsx  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
index ffd987957..38baa8f86 100644
--- a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
+++ b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
@@ -522,7 +522,6 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: true,
                 ack: true,
                 q: true,
-                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
                 returnNewestEntries: true,

From 15bc298afe401203a93873b7d4d866f3b6794d2b Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 13:58:08 +0000
Subject: [PATCH 09/15] Trying to fix CI

---
 .../admin/src-admin/src/components/Object/ObjectHistoryData.tsx  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
index 38baa8f86..4a388a6fb 100644
--- a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
+++ b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
@@ -633,7 +633,6 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: false,
                 ack: false,
                 q: false,
-                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
             })

From 1a295d426c75c6fbfe980c6e27231bd86f163ab4 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 14:06:56 +0000
Subject: [PATCH 10/15] Trying to fix CI

---
 .../src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
index 0913e5c05..4d667b95a 100644
--- a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
+++ b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
@@ -655,7 +655,6 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
                                     variant="standard"
                                     id="siteName"
                                     label={this.props.t('Site name')}
-                                    // @ts-expect-error Fixed in js-controller 7
                                     value={this.props.data.common.siteName || ''}
                                     onChange={e => this.doChange('siteName', e.target.value)}
                                     helperText={this.props.t(
@@ -663,7 +662,6 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
                                     )}
                                     slotProps={{
                                         input: {
-                                            // @ts-expect-error Fixed in js-controller 7
                                             endAdornment: this.props.data.common.siteName ? (
                                                 <InputAdornment position="end">
                                                     <IconButton

From 2984d1773566af81e63ea53fa39b21785a9bc5b3 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 14:14:37 +0000
Subject: [PATCH 11/15] Trying to fix CI

---
 .../src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
index 5d739c9e3..8adab9ab4 100644
--- a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
+++ b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
@@ -459,7 +459,6 @@ class RepositoriesDialog extends BaseSystemSettingsDialog<RepositoriesDialogProp
                         <span>
                             <Checkbox
                                 disabled
-                                // @ts-expect-error Fixed in js-controller 7
                                 checked={this.props.repoInfo[item.title]?.stable}
                                 indeterminate={!this.props.repoInfo[item.title]}
                             />

From b55fd090bdb72e5172f4d4a61ec2efd800d6cbb5 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 15:44:47 +0000
Subject: [PATCH 12/15] Trying to fix CI

---
 .github/workflows/test-and-release.yml | 40 ++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index 34089a7ed..4c7b84b71 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -31,8 +31,7 @@ jobs:
                   node-version: 20.x
 
             - name: 'Install'
-              run: |
-                  npm i -f
+              run: npm i -f
 
             - name: 'Install Adapter'
               run: npm i -w packages/admin -f
@@ -111,14 +110,43 @@ jobs:
               with:
                   node-version: 20.x
 
-            - name: Install Dependencies
-              run: npm run install-monorepo
+            - name: 'Install'
+              run: npm i -f
+
+            - name: 'Install Adapter'
+              run: npm i -w packages/admin -f
+
+            - name: 'Install FE'
+              run: |
+                cd packages/admin/src-admin
+                npm i -f
+
+            - name: 'Lint Backend'
+              run: npm run lint-backend -w packages/admin
 
             - name: 'Build backend'
               run: npm run build:backend -w packages/admin
 
-            - name: Build
-              run: NODE_OPTIONS=--max_old_space_size=8192 npm run build
+            - name: 'Build adapter-react-v5'
+              run: npm run build -w packages/adapter-react-v5
+
+            - name: 'Build JsonConfig'
+              run: npm run build -w packages/jsonConfig
+
+            - name: 'Build dm-gui-components'
+              run: npm run build -w packages/dm-gui-components
+
+            - name: Check TypeScript files
+              run: |
+                cd packages/admin/src-admin
+                npm run check-ts
+              # Wait till js-controller 7 types are available
+              continue-on-error: true
+
+            - name: 'Build'
+              run: |
+                npm run clean
+                NODE_OPTIONS=--max_old_space_size=4096 npm run build
 
             - name: Run GUI tests
               run: npm run test:gui -w packages/admin/

From edf206eb2bf3edff3b3881a2767672cab98d7ec8 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 16:29:59 +0000
Subject: [PATCH 13/15] Fixing dialog in dm-component

---
 packages/dm-gui-components/src/Communication.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/dm-gui-components/src/Communication.tsx b/packages/dm-gui-components/src/Communication.tsx
index b7b61eea0..50e6e3a21 100644
--- a/packages/dm-gui-components/src/Communication.tsx
+++ b/packages/dm-gui-components/src/Communication.tsx
@@ -579,6 +579,7 @@ class Communication<P extends CommunicationProps, S extends CommunicationState>
                 open={!0}
                 onClose={() => this.state.form?.handleClose && this.state.form.handleClose()}
                 hideBackdrop
+                fullWidth
                 maxWidth={this.state.form.maxWidth || 'md'}
             >
                 {this.state.form?.title ? (

From 905f707cc7b30ce684ab9284a05245e6e70b2fa6 Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 16:38:51 +0000
Subject: [PATCH 14/15] Fixing CI pipeline

---
 .github/workflows/create-release.yml   | 12 ++---
 .github/workflows/test-and-release.yml | 67 +++-----------------------
 2 files changed, 12 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index e7150e233..f4ff00fe6 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -17,23 +17,19 @@ jobs:
     publish-config:
         runs-on: ubuntu-20.04
 
-        strategy:
-            matrix:
-                node: [20.x] # This should be LTS
-
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
                   fetch-depth: 0 # Fetch the history, or this action won't work
 
-            - name: Use Node.js ${{ matrix.node }}
+            - name: Use Node.js 20.x
               uses: actions/setup-node@v4
               with:
-                  node-version: ${{ matrix.node }}
+                  node-version: 20.x
 
-            - name: Install dependencies
-              run: npm ci -f
+            - name: Install Dependencies
+              run: npm run install-monorepo
 
             - name: 'Build backend'
               run: npm run build:backend -w packages/admin
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
index 4c7b84b71..30f3eb93d 100644
--- a/.github/workflows/test-and-release.yml
+++ b/.github/workflows/test-and-release.yml
@@ -30,32 +30,12 @@ jobs:
               with:
                   node-version: 20.x
 
-            - name: 'Install'
-              run: npm i -f
-
-            - name: 'Install Adapter'
-              run: npm i -w packages/admin -f
-
-            - name: 'Install FE'
-              run: |
-                  cd packages/admin/src-admin
-                  npm i -f
-
-            - name: 'Lint Backend'
-              run: npm run lint-backend -w packages/admin
+            - name: Install Dependencies
+              run: npm run install-monorepo
 
             - name: 'Build backend'
               run: npm run build:backend -w packages/admin
 
-            - name: 'Build adapter-react-v5'
-              run: npm run build -w packages/adapter-react-v5
-
-            - name: 'Build JsonConfig'
-              run: npm run build -w packages/jsonConfig
-
-            - name: 'Build dm-gui-components'
-              run: npm run build -w packages/dm-gui-components
-
             - name: Check TypeScript files
               run: |
                   cd packages/admin/src-admin
@@ -63,10 +43,8 @@ jobs:
               # Wait till js-controller 7 types are available
               continue-on-error: true
 
-            - name: 'Build'
-              run: |
-                  npm run clean
-                  NODE_OPTIONS=--max_old_space_size=4096 npm run build
+            - name: Build
+              run: NODE_OPTIONS=--max_old_space_size=8192 npm run build
 
     # Runs adapter tests on all supported node versions and OSes
     adapter-tests:
@@ -110,43 +88,14 @@ jobs:
               with:
                   node-version: 20.x
 
-            - name: 'Install'
-              run: npm i -f
-
-            - name: 'Install Adapter'
-              run: npm i -w packages/admin -f
-
-            - name: 'Install FE'
-              run: |
-                cd packages/admin/src-admin
-                npm i -f
-
-            - name: 'Lint Backend'
-              run: npm run lint-backend -w packages/admin
+            - name: Install Dependencies
+              run: npm run install-monorepo
 
             - name: 'Build backend'
               run: npm run build:backend -w packages/admin
 
-            - name: 'Build adapter-react-v5'
-              run: npm run build -w packages/adapter-react-v5
-
-            - name: 'Build JsonConfig'
-              run: npm run build -w packages/jsonConfig
-
-            - name: 'Build dm-gui-components'
-              run: npm run build -w packages/dm-gui-components
-
-            - name: Check TypeScript files
-              run: |
-                cd packages/admin/src-admin
-                npm run check-ts
-              # Wait till js-controller 7 types are available
-              continue-on-error: true
-
-            - name: 'Build'
-              run: |
-                npm run clean
-                NODE_OPTIONS=--max_old_space_size=4096 npm run build
+            - name: Build
+              run: NODE_OPTIONS=--max_old_space_size=8192 npm run build
 
             - name: Run GUI tests
               run: npm run test:gui -w packages/admin/

From f0f9b4dd6bbc17fc18c8a8cefbd7e548c454a66d Mon Sep 17 00:00:00 2001
From: GermanBluefox <dogafox@gmail.com>
Date: Wed, 11 Dec 2024 17:07:54 +0000
Subject: [PATCH 15/15] Fixing CI pipeline

---
 packages/admin/src-admin/src/App.tsx                 | 12 +++++++++---
 .../src-admin/src/components/Object/ObjectChart.tsx  |  2 ++
 .../src/components/Object/ObjectHistoryData.tsx      |  2 ++
 .../SystemSettingsTabs/MainSettingsDialog.tsx        |  2 ++
 .../SystemSettingsTabs/RepositoriesDialog.tsx        |  1 +
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/admin/src-admin/src/App.tsx b/packages/admin/src-admin/src/App.tsx
index e041be171..e3fc2c3d8 100644
--- a/packages/admin/src-admin/src/App.tsx
+++ b/packages/admin/src-admin/src/App.tsx
@@ -2411,9 +2411,13 @@ class App extends Router<AppProps, AppState> {
         if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') {
             return (
                 <div>
-                    {this.state.systemConfig.common.siteName ? (
-                        <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
-                    ) : null}
+                    {
+                        // @ts-expect-error fixed in js-controller 7
+                        this.state.systemConfig.common.siteName ? (
+                            // @ts-expect-error fixed in js-controller 7
+                            <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>
+                        ) : null
+                    }
 
                     <Box
                         component="div"
@@ -2456,7 +2460,9 @@ class App extends Router<AppProps, AppState> {
                 </div>
             );
         }
+        // @ts-expect-error fixed in js-controller 7
         if (this.props.width !== 'xs' && this.props.width !== 'sm' && this.state.systemConfig.common.siteName) {
+            // @ts-expect-error fixed in js-controller 7
             return <div style={styles.siteName}>{this.state.systemConfig.common.siteName}</div>;
         }
         return null;
diff --git a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
index 191d037a8..87b2682d4 100644
--- a/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
+++ b/packages/admin/src-admin/src/components/Object/ObjectChart.tsx
@@ -520,6 +520,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
                     from: false,
                     ack: false,
                     q: false,
+                    // @ts-expect-error fixed in js-controller 7
                     addId: false,
                     aggregate: 'none',
                 })
@@ -565,6 +566,7 @@ class ObjectChart extends Component<ObjectChartProps, ObjectChartState> {
             from: false,
             ack: false,
             q: false,
+            // @ts-expect-error fixed in js-controller 7
             addId: false,
             aggregate: 'none',
             returnNewestEntries: true,
diff --git a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
index 4a388a6fb..ffd987957 100644
--- a/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
+++ b/packages/admin/src-admin/src/components/Object/ObjectHistoryData.tsx
@@ -522,6 +522,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: true,
                 ack: true,
                 q: true,
+                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
                 returnNewestEntries: true,
@@ -633,6 +634,7 @@ class ObjectHistoryData extends Component<ObjectHistoryDataProps, ObjectHistoryD
                 from: false,
                 ack: false,
                 q: false,
+                // @ts-expect-error fixed in js-controller 7
                 addId: false,
                 aggregate: 'none',
             })
diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
index 4d667b95a..0913e5c05 100644
--- a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
+++ b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/MainSettingsDialog.tsx
@@ -655,6 +655,7 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
                                     variant="standard"
                                     id="siteName"
                                     label={this.props.t('Site name')}
+                                    // @ts-expect-error Fixed in js-controller 7
                                     value={this.props.data.common.siteName || ''}
                                     onChange={e => this.doChange('siteName', e.target.value)}
                                     helperText={this.props.t(
@@ -662,6 +663,7 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
                                     )}
                                     slotProps={{
                                         input: {
+                                            // @ts-expect-error Fixed in js-controller 7
                                             endAdornment: this.props.data.common.siteName ? (
                                                 <InputAdornment position="end">
                                                     <IconButton
diff --git a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
index 8adab9ab4..5d739c9e3 100644
--- a/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
+++ b/packages/admin/src-admin/src/dialogs/SystemSettingsTabs/RepositoriesDialog.tsx
@@ -459,6 +459,7 @@ class RepositoriesDialog extends BaseSystemSettingsDialog<RepositoriesDialogProp
                         <span>
                             <Checkbox
                                 disabled
+                                // @ts-expect-error Fixed in js-controller 7
                                 checked={this.props.repoInfo[item.title]?.stable}
                                 indeterminate={!this.props.repoInfo[item.title]}
                             />