From 7396edfa8e1fe0aa32a9c2342f6ee6215ebbf22a Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Tue, 10 Dec 2024 22:36:31 +0000 Subject: [PATCH] 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 { 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 { 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 { if (this.state.user && this.props.width !== 'xs' && this.props.width !== 'sm') { return (
- {this.state.systemConfig.common.siteName ? ( -
{this.state.systemConfig.common.siteName}
- ) : null} + { + // @ts-expect-error fixed in js-controller 7 + this.state.systemConfig.common.siteName ? ( + // @ts-expect-error fixed in js-controller 7 +
{this.state.systemConfig.common.siteName}
+ ) : null + } {
); } + // @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
{this.state.systemConfig.common.siteName}
; } 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 { 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 { 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 { 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 { )} slotProps={{ input: { + // @ts-expect-error Fixed in js-controller 7 endAdornment: this.props.data.common.siteName ? ( 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; - buttons?: (ActionButton | 'apply' | 'cancel')[]; + buttons?: (ActionButton | 'apply' | 'cancel' | 'close')[]; maxWidth?: 'xs' | 'sm' | 'md' | 'lg' | 'xl'; } @@ -520,7 +520,7 @@ class Communication

); } - 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

); } - 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

variant={button?.variant || 'contained'} color={button?.color || 'grey'} onClick={() => this.state.form?.handleClose && this.state.form.handleClose()} - startIcon={button?.icon ? : undefined} + startIcon={isClose ? : button?.icon ? : undefined} > {getTranslation(button?.label || 'cancelButtonText', button?.noTranslation)} @@ -562,7 +564,7 @@ class Communication

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 {