Corrected text (#2761)

#2744

.github/workflows/test-and-release.yml

@@ -48,8 +48,8 @@ jobs:
             - name: 'Build backend'
               run: npm run build:backend -w packages/admin
 
-            - name: 'Build React-Components'
-              run: npm run build -w packages/react-components
+            - name: 'Build adapter-react-v5'
+              run: npm run build -w packages/adapter-react-v5
 
             - name: 'Build JsonConfig'
               run: npm run build -w packages/jsonConfig

DEVELOPER.md

@@ -14,8 +14,9 @@ or step-by-step
 
 ```bash
 npm i -f
+npm i -w packages/adapter-react-v5 -f
+npm i -w packages/jsonConfig -f
 npm i -w packages/dm-gui-components -f
-npm i -f -w packages/jsonConfig
 npm i -w packages/admin -f
 ```
 

README.md

@@ -87,7 +87,7 @@ The icons may not be reused in other projects without the proper flaticon licens
 <!--
 	### **WORK IN PROGRESS**
 -->
-### 7.2.5 (2024-10-10)
+### **WORK IN PROGRESS**
 
 -   (@GermanBluefox) Trying to fix a GUI build process
 -   (@GermanBluefox) Changed license icon

package.json

@@ -7,7 +7,7 @@
     "dependencies": {
         "@iobroker/dm-gui-components": "file:packages/dm-gui-components",
         "@iobroker/json-config": "file:packages/jsonConfig",
-        "@iobroker/react-components": "file:packages/react-components",
+        "@iobroker/adapter-react-v5": "file:packages/adapter-react-v5",
         "iobroker.admin": "file:packages/admin"
     },
     "devDependencies": {
@@ -28,7 +28,7 @@
     "scripts": {
         "build": "npm run clean && lerna run build",
         "clean": "lerna run clean",
-        "install-monorepo": "npm i && npm i -w packages/react-components && npm i -w packages/dm-gui-components && npm i -w packages/jsonConfig && npm i -w packages/admin",
+        "install-monorepo": "npm i && npm i -w packages/adapter-react-v5 && npm i -w packages/dm-gui-components && npm i -w packages/jsonConfig && npm i -w packages/admin",
         "npm": "npm run install-monorepo",
         "start": "npm run start -w packages/admin",
         "release": "release-script -y --noPush --no-update-lockfile",
@@ -37,6 +37,6 @@
         "release-major": "release-script major --yes --no-update-lockfile --publishAll",
         "prettier": "cd packages/admin && npm run prettier && cd src-admin && npm run prettier && cd ../../dm-gui-components && npm run prettier && cd ../jsonConfig && npm run prettier",
         "lint": "cd packages/admin && npm run lint-backend && cd src-admin && npm run lint && cd ../../dm-gui-components && npm run lint && cd ../jsonConfig && npm run lint",
-        "update-packages": "ncu --upgrade && cd packages/admin && ncu --upgrade && cd src-admin && ncu --upgrade && cd ../../dm-gui-components && ncu --upgrade && cd ../jsonConfig && ncu --upgrade"
+        "update-packages": "ncu --upgrade && cd packages/adapter-react-v5 && ncu --upgrade && cd packages/admin && ncu --upgrade && cd src-admin && ncu --upgrade && cd ../../dm-gui-components && ncu --upgrade && cd ../jsonConfig && ncu --upgrade"
     }
 }

packages/react-components/README.md → 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/react-components": "^7.2.4",
+        "@iobroker/adapter-react-v5": "^7.2.5",
         ```
         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/react-components": "^7.2.4",
+        "@iobroker/adapter-react-v5": "^7.2.5",
         "@iobroker/build-tools": "^1.0.0",
         "@iobroker/eslint-config": "^0.1.2",
         "@mui/material": "^6.0.2",
@@ -52,7 +52,7 @@ If you want to create the configuration page with ReactJS:
 ```
 
 5. Call in `src`: `npm install`
-6. Copy `tasks.js` into `src`: `cp node_modules/@iobroker/react-components/tasks.js tasks.js`
+6. Copy `tasks.js` into `src`: `cp node_modules/@iobroker/adapter-react-v5/tasks.js tasks.js`
 7. Add scripts to your `package.json` `scripts` section:
 
 ```json
@@ -227,7 +227,7 @@ Usage:
 
 ```jsx
 import React from 'react';
-import { I18n, Confirm as ConfirmDialog } from '@iobroker/react-components';
+import { I18n, Confirm as ConfirmDialog } from '@iobroker/adapter-react-v5';
 
 class ExportImportDialog extends React.Component {
     constructor(props) {
@@ -296,7 +296,7 @@ renderMessage() {
 ![Logo](img/selectID.png)
 
 ```jsx
-import { SelectID as DialogSelectID } from '@iobroker/react-components';
+import { SelectID as DialogSelectID } from '@iobroker/adapter-react-v5';
 
 class MyComponent extends Component {
     constructor(props) {

packages/react-components/modulefederation.admin.config.js → packages/adapter-react-v5/modulefederation.admin.config.js

@@ -12,7 +12,7 @@ function makeShared(pkgs) {
 // Admin shares these modules for all components
 module.exports = {
     shared: makeShared([
-        '@iobroker/react-components',
+        '@iobroker/adapter-react-v5',
         '@iobroker/json-config',
         '@iobroker/dm-gui-components',
         '@mui/icons-material',

packages/react-components/package.json → packages/adapter-react-v5/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "@iobroker/react-components",
+    "name": "@iobroker/adapter-react-v5",
     "version": "7.2.5",
     "description": "React components to develop ioBroker interfaces with react.",
     "author": {

packages/admin/io-package.json

@@ -19,32 +19,6 @@
     "connectionType": "local",
     "dataSource": "push",
     "news": {
-      "7.2.5": {
-        "en": "Trying to fix a GUI build process\nChanged license icon",
-        "de": "Versuchen, einen GUI-Building-Prozess zu beheben\nGeändertes Lizenzsymbol",
-        "ru": "Попытка исправить процесс построения графического интерфейса\nИзменение иконки лицензии",
-        "pt": "Tentando corrigir um processo de compilação GUI\nÍcone de licença alterado",
-        "nl": "Proberen een GUI build proces te repareren\nGewijzigd licentiepictogram",
-        "fr": "Essayer de réparer un processus de construction d'interface graphique\nIcône de licence modifiée",
-        "it": "Cercare di risolvere un processo di costruzione GUI\nIcona di licenza modificata",
-        "es": "Tratando de arreglar un proceso de construcción GUI\nIcono de licencia cambiado",
-        "pl": "Próbuje naprawić proces budowania GUI\nZmieniona ikona licencji",
-        "uk": "Спробуйте виправити процес побудови GUI\nЗміна іконки ліцензії",
-        "zh-cn": "试图修正图形界面构建进程\n更改许可证图标"
-      },
-      "7.2.4": {
-        "en": "Corrected some GUI errors\nIgnore error by opening `0_userdata.0`",
-        "de": "Einige GUI-Fehler korrigiert\nFehler ignorieren durch Öffnen von `0_userdata.0`",
-        "ru": "Исправлены некоторые ошибки GUI\nИгнорировать ошибку, открывая `0_userdata.0`",
-        "pt": "Corrigido alguns erros GUI\nIgnorar erro ao abrir `0_userdata.0`",
-        "nl": "Enkele GUI-fouten gecorrigeerd\nFout negeren door het openen van ",
-        "fr": "Correction de certaines erreurs d'interface graphique\nIgnorer l'erreur en ouvrant `0_userdata.0`",
-        "it": "Corretto alcuni errori GUI\nIgnora errore aprendo `0_userdata.0`",
-        "es": "Corregido algunos errores de GUI\nIgnora el error al abrir `0_userdata.0`",
-        "pl": "Poprawiono niektóre błędy GUI\nIgnoruj błąd otwierając '0 _ userdata.0'",
-        "uk": "Виправлено деякі помилки інтерфейсу\nІм’я користувача `0_userdata.0`",
-        "zh-cn": "更正了一些图形用户界面错误\n打开 '0_userdata.0' 忽略错误"
-      },
       "7.2.0": {
         "en": "Added the check of well-known passwords for the linux systems\nAdded the history for the installation from URL\nfixed wrongly displayed repository warning",
         "de": "Hinzugefügt die Überprüfung der bekannten Passwörter für die Linux-Systeme\nDie Geschichte der Installation von URL hinzugefügt\nfalsch angezeigte repository-warnung",

packages/admin/package.json

@@ -28,7 +28,7 @@
         "@iobroker/socket-classes": "^1.6.1",
         "@iobroker/webserver": "^1.0.6",
         "@iobroker/ws": "^2.0.0",
-        "@iobroker/ws-server": "3.0.3",
+        "@iobroker/ws-server": "4.0.1",
         "ajv": "^8.17.1",
         "archiver": "^7.0.1",
         "axios": "^1.7.7",
@@ -69,10 +69,10 @@
         "colorette": "^2.0.20",
         "less": "^4.2.0",
         "mocha": "^10.7.3",
-        "puppeteer": "^23.5.1",
+        "puppeteer": "^23.5.3",
         "sinon-chai": "^3.7.0",
         "src-rx": "file:src-admin",
-        "typescript": "^5.6.2"
+        "typescript": "^5.6.3"
     },
     "bugs": {
         "url": "https://github.com/ioBroker/ioBroker.admin/issues"

packages/admin/src-admin/craco.config.js

@@ -1,6 +1,6 @@
 const path = require('node:path');
 const { ProvidePlugin } = require('webpack');
-const cracoModuleFederation = require('@iobroker/react-components/craco-module-federation');
+const cracoModuleFederation = require('@iobroker/adapter-react-v5/craco-module-federation');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 
 module.exports = {

packages/admin/src-admin/modulefederation.config.js

@@ -1,4 +1,4 @@
-const { shared } = require('@iobroker/react-components/modulefederation.admin.config');
+const { shared } = require('@iobroker/adapter-react-v5/modulefederation.admin.config');
 
 module.exports = {
     name: 'iobroker_admin',

packages/admin/src-admin/package.json

@@ -22,7 +22,7 @@
     "dependencies": {
         "@iobroker/dm-gui-components": "file:../../dm-gui-components",
         "@iobroker/json-config": "file:../../jsonConfig",
-        "@iobroker/react-components": "file:../../react-components",
+        "@iobroker/adapter-react-v5": "file:../../adapter-react-v5",
         "http-proxy-middleware": "^3.0.2"
     },
     "devDependencies": {
@@ -34,7 +34,7 @@
         "@fnando/sparkline": "^0.3.10",
         "@foxriver76/iob-component-lib": "^0.1.6",
         "@honkhonk/vite-plugin-svgr": "^1.1.0",
-        "@iobroker/admin-component-easy-access": "^1.0.1",
+        "@iobroker/admin-component-easy-access": "^1.0.8",
         "@iobroker/dm-utils": "^0.5.0",
         "@iobroker/eslint-config": "^0.1.6",
         "@iobroker/js-controller-common-db": "^7.0.0",
@@ -113,5 +113,5 @@
             }
         ]
     ],
-    "version": "7.2.4"
+    "version": "7.2.5"
 }

packages/admin/src-admin/src/App.tsx

@@ -65,7 +65,7 @@ import {
     type ThemeType,
     Utils,
     dictionary,
-} from '@iobroker/react-components';
+} from '@iobroker/adapter-react-v5';
 
 import NotificationsDialog from '@/dialogs/NotificationsDialog';
 import type { AdminGuiConfig, CompactAdapterInfo, CompactHost, NotificationsCount } from '@/types';

packages/admin/src-admin/src/Workers/AdaptersWorker.tsx

@@ -1,4 +1,4 @@
-import { type AdminConnection } from '@iobroker/react-components';
+import { type AdminConnection } from '@iobroker/adapter-react-v5';
 import GenericWorker, { type EventType, type GenericEvent } from './GenericWorker';
 
 export type AdapterEventType = EventType;

packages/admin/src-admin/src/Workers/GenericWorker.tsx

@@ -1,4 +1,4 @@
-import type { AdminConnection } from '@iobroker/react-components';
+import type { AdminConnection } from '@iobroker/adapter-react-v5';
 import AdminUtils from '@/helpers/AdminUtils';
 
 export type EventType = 'new' | 'changed' | 'deleted';

packages/admin/src-admin/src/Workers/HostAdapterWorker.tsx

@@ -1,4 +1,4 @@
-import { type AdminConnection } from '@iobroker/react-components';
+import { type AdminConnection } from '@iobroker/adapter-react-v5';
 import GenericWorker, { type EventType, type GenericEvent } from './GenericWorker';
 
 export type HostAdapterEventType = EventType;

packages/admin/src-admin/src/Workers/HostsWorker.tsx

@@ -1,4 +1,4 @@
-import type { AdminConnection } from '@iobroker/react-components';
+import type { AdminConnection } from '@iobroker/adapter-react-v5';
 import type { FilteredNotificationInformation } from '@iobroker/socket-client';
 import GenericWorker, { type EventType, type GenericEvent } from './GenericWorker';
 

packages/admin/src-admin/src/Workers/InstancesWorker.tsx

@@ -1,4 +1,4 @@
-import { type AdminConnection } from '@iobroker/react-components';
+import { type AdminConnection } from '@iobroker/adapter-react-v5';
 import GenericWorker, { type EventType, type GenericEvent } from './GenericWorker';
 
 export type InstanceEventType = EventType;

packages/admin/src-admin/src/Workers/LogsWorker.tsx

@@ -1,4 +1,4 @@
-import { type AdminConnection } from '@iobroker/react-components';
+import { type AdminConnection } from '@iobroker/adapter-react-v5';
 import AdminUtils, { type Style } from '../helpers/AdminUtils';
 
 interface LogLine {

packages/admin/src-admin/src/Workers/ObjectsWorker.tsx

@@ -1,4 +1,4 @@
-import { type AdminConnection } from '@iobroker/react-components';
+import { type AdminConnection } from '@iobroker/adapter-react-v5';
 import AdminUtils from '../helpers/AdminUtils';
 
 export type ObjectEventType = 'new' | 'changed' | 'deleted';

packages/admin/src-admin/src/components/Adapters/AdapterCategoryRow.tsx

@@ -6,7 +6,7 @@ import { blue, green } from '@mui/material/colors';
 
 import { ChevronRight as ChevronRightIcon, ExpandMore as ExpandMoreIcon } from '@mui/icons-material';
 
-import { type Translate } from '@iobroker/react-components';
+import { type Translate } from '@iobroker/adapter-react-v5';
 
 import MaterialDynamicIcon from '../../helpers/MaterialDynamicIcon';
 

packages/admin/src-admin/src/components/Adapters/AdapterGeneric.tsx

@@ -39,7 +39,7 @@ import {
     Build as BuildIcon,
 } from '@mui/icons-material';
 
-import { type IobTheme, Utils } from '@iobroker/react-components';
+import { type IobTheme, Utils } from '@iobroker/adapter-react-v5';
 
 import AdapterUpdateDialog from '@/dialogs/AdapterUpdateDialog';
 import CustomModal from '@/components/CustomModal';

packages/admin/src-admin/src/components/Adapters/AdapterInstallDialog.tsx

@@ -1,7 +1,7 @@
 import React, { Component, type JSX } from 'react';
 import semver from 'semver';
 
-import { type Translate, type AdminConnection, type ThemeType, type IobTheme, I18n } from '@iobroker/react-components';
+import { type Translate, type AdminConnection, type ThemeType, type IobTheme, I18n } from '@iobroker/adapter-react-v5';
 
 import { checkCondition, type CompactInstanceInfo } from '@/dialogs/AdapterUpdateDialog';
 

packages/admin/src-admin/src/components/Adapters/AdapterTile.tsx

@@ -5,7 +5,7 @@ import { Box, Card, CardContent, CardMedia, Fab, Tooltip, Typography } from '@mu
 import { MoreVert as MoreVertIcon } from '@mui/icons-material';
 import { amber } from '@mui/material/colors';
 
-import { type IobTheme, Utils } from '@iobroker/react-components';
+import { type IobTheme, Utils } from '@iobroker/adapter-react-v5';
 
 import IsVisible from '../IsVisible';
 import AdapterGeneric, {

packages/admin/src-admin/src/components/Adapters/AdaptersList.tsx

@@ -12,7 +12,7 @@ import {
     Typography,
 } from '@mui/material';
 
-import { TabContent } from '@iobroker/react-components';
+import { TabContent } from '@iobroker/adapter-react-v5';
 
 import type { AdaptersContext } from '@/components/Adapters/AdapterInstallDialog';
 import AdapterCategoryRow from '@/components/Adapters/AdapterCategoryRow';

packages/admin/src-admin/src/components/Adapters/AdaptersUpdater.tsx

@@ -22,7 +22,7 @@ import {
 
 import { Close as CloseIcon, Language as LanguageIcon, Info as InfoIcon } from '@mui/icons-material';
 
-import { I18n, type IobTheme, Utils } from '@iobroker/react-components';
+import { I18n, type IobTheme, Utils } from '@iobroker/adapter-react-v5';
 
 import type { AdapterRatingInfo, InstalledInfo } from '@/components/Adapters/AdapterInstallDialog';
 import { checkCondition } from '@/dialogs/AdapterUpdateDialog';

packages/admin/src-admin/src/components/BaseSettings/BaseSettingsLog.tsx

@@ -30,7 +30,7 @@ import {
     Computer as IconSyslog,
     Send as IconStream,
 } from '@mui/icons-material';
-import { withWidth, type IobTheme, type Translate } from '@iobroker/react-components';
+import { withWidth, type IobTheme, type Translate } from '@iobroker/adapter-react-v5';
 import IconSeq from '../../assets/seq.png';
 
 const styles: Record<string, any> = {

packages/admin/src-admin/src/components/BaseSettings/BaseSettingsMultihost.tsx

@@ -2,7 +2,7 @@ import React, { createRef, Component, type JSX } from 'react';
 
 import { Grid2, FormControlLabel, Checkbox, TextField, Paper } from '@mui/material';
 
-import { type AdminConnection, withWidth, type Translate } from '@iobroker/react-components';
+import { type AdminConnection, withWidth, type Translate } from '@iobroker/adapter-react-v5';
 
 const styles: Record<string, React.CSSProperties> = {
     paper: {

packages/admin/src-admin/src/components/BaseSettings/BaseSettingsObjects.tsx

@@ -18,7 +18,7 @@ import {
     Box,
 } from '@mui/material';
 
-import { withWidth, DialogConfirm, type IobTheme, type Translate } from '@iobroker/react-components';
+import { withWidth, DialogConfirm, type IobTheme, type Translate } from '@iobroker/adapter-react-v5';
 import { type AdminConnection } from '@iobroker/socket-client';
 
 const styles: Record<string, any> = {

packages/admin/src-admin/src/components/BaseSettings/BaseSettingsPlugins.tsx

@@ -2,7 +2,7 @@ import React, { Component, type JSX } from 'react';
 
 import { Paper } from '@mui/material';
 
-import { withWidth, type ThemeType, type Translate } from '@iobroker/react-components';
+import { withWidth, type ThemeType, type Translate } from '@iobroker/adapter-react-v5';
 
 import Editor from '../Editor';
 

packages/admin/src-admin/src/components/BaseSettings/BaseSettingsStates.tsx

@@ -18,7 +18,7 @@ import {
     Box,
 } from '@mui/material';
 
-import { DialogConfirm, withWidth, type IobTheme, type Translate } from '@iobroker/react-components';
+import { DialogConfirm, withWidth, type IobTheme, type Translate } from '@iobroker/adapter-react-v5';
 
 import { type AdminConnection } from '@iobroker/socket-client';
 

packages/admin/src-admin/src/components/BaseSettings/BaseSettingsSystem.tsx

@@ -2,7 +2,7 @@ import React, { createRef, Component, type JSX } from 'react';
 
 import { Grid2, FormControlLabel, Checkbox, TextField, Paper } from '@mui/material';
 
-import { withWidth, type Translate } from '@iobroker/react-components';
+import { withWidth, type Translate } from '@iobroker/adapter-react-v5';
 
 const styles: Record<string, any> = {
     paper: {

packages/admin/src-admin/src/components/Command.tsx

@@ -4,7 +4,7 @@ import { amber, blue, red } from '@mui/material/colors';
 
 import { Grid2, LinearProgress, Paper, Switch, Typography } from '@mui/material';
 
-import { Router, type AdminConnection, type Translate } from '@iobroker/react-components';
+import { Router, type AdminConnection, type Translate } from '@iobroker/adapter-react-v5';
 
 import AdminUtils, { type Style } from '../helpers/AdminUtils';
 

packages/admin/src-admin/src/components/CustomDragLayer.tsx

@@ -3,7 +3,7 @@ import { useDragLayer } from 'react-dnd';
 
 import { Box } from '@mui/material';
 
-import type { IobTheme } from '@iobroker/react-components';
+import type { IobTheme } from '@iobroker/adapter-react-v5';
 
 import DrawerItem from './DrawerItem';
 

packages/admin/src-admin/src/components/CustomModal.tsx

@@ -14,7 +14,7 @@ import {
 
 import { Check as CheckIcon, Close as CloseIcon, Language as LanguageIcon } from '@mui/icons-material';
 
-import { I18n, type IobTheme, Utils } from '@iobroker/react-components';
+import { I18n, type IobTheme, Utils } from '@iobroker/adapter-react-v5';
 
 const styles: Record<string, any> = {
     modalDialog: {