@iobroker/adapter-react-v5 7.4.22 → 7.5.1

package/i18n/zh-cn.json

@@ -46,6 +46,7 @@
     "ra_Configure visible columns": "配置可见列",
     "ra_Confirm deletion of %s": "确认删除%s",
     "ra_Connected": "连接的",
+    "ra_Continue": "继续",
     "ra_Copied": "复制的",
     "ra_Copied %s": "复制的\"%s\"",
     "ra_Copy content": "复制内容",
@@ -66,6 +67,7 @@
     "ra_Device → Channel → State": "设备→频道→状态",
     "ra_Discard": "丢弃",
     "ra_Disconnected": "断开连接",
+    "ra_Do not ask for next 2 hours in this session": "本次会话中不要询问接下来的 2 个小时",
     "ra_Do not export values of states": "不导出状态值",
     "ra_Do not use let's encrypt": "不要使用让我们加密",
     "ra_Double click to reset table layout": "双击重置表格布局",
@@ -76,6 +78,7 @@
     "ra_Edit ACL": "编辑访问控制列表",
     "ra_Edit alias": "编辑别名",
     "ra_Edit custom config": "编辑自定义配置",
+    "ra_Edit full path": "编辑完整路径",
     "ra_Edit function": "编辑功能",
     "ra_Edit object field": "编辑对象字段",
     "ra_Edit role": "编辑角色",
@@ -123,6 +126,7 @@
     "ra_License not found in license manager. Do you want to read licenses from iobroker.net?": "在许可证管理器中找不到许可证。您要从 iobroker.net 更新许可证吗？",
     "ra_Listen on all IPs": "监听所有IP",
     "ra_Load configuration from file": "从文件加载配置",
+    "ra_Logout": "登出",
     "ra_Longitude": "经度",
     "ra_May not trigger \"updateLicenses\"": "可能不会触发“updateLicenses”",
     "ra_Message": "信息",
@@ -158,6 +162,7 @@
     "ra_Quality code": "质量代码",
     "ra_Refresh tree": "刷新树",
     "ra_Reload files": "重新载入文件",
+    "ra_Rename_Move_Copy": "重命名/移动/复制",
     "ra_Repeat": "重复",
     "ra_Replace": "代替",
     "ra_Request timed out": "请求超时",
@@ -176,6 +181,7 @@
     "ra_Selected %s object(s)": "选定的 %s 个对象",
     "ra_Serial number (UUID)": "序列号 (UUID)",
     "ra_Serial number (UUID) \"%s\" in license is for other device.": "许可证中的序列号 (UUID)“%s”用于其他设备。",
+    "ra_Session will expire in %s seconds. Continue?": "会话将在 %s 秒后过期。是否继续？",
     "ra_Show all folders": "显示所有文件夹",
     "ra_Show lines between rows": "显示行之间的线",
     "ra_Show/Hide object descriptions": "显示/隐藏对象描述",

package/index.css

@@ -1,56 +1,56 @@
-/**
- * Copyright 2018-2023 Denis Haev (bluefox) <dogafox@gmail.com>
- *
- * MIT License
- *
- **/
-
-html {
-    height: 100%;
-}
-
-body {
-    margin: 0;
-    padding: 0;
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
-        'Droid Sans', 'Helvetica Neue', sans-serif;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
-/* scrollbar */
-::-webkit-scrollbar-track {
-    background-color: #ccc;
-    border-radius: 5px;
-}
-
-::-webkit-scrollbar {
-    width: 5px;
-    height: 5px;
-    background-color: #ccc;
-}
-
-::-webkit-scrollbar-thumb {
-    background-color: #575757;
-    border-radius: 5px;
-}
-
-#root {
-    height: 100%;
-}
-
-.App {
-    height: 100%;
-}
-
-@keyframes glow {
-    from {
-        background-color: initial;
-    }
-    to {
-        background-color: #58c458;
-    }
-}
+/**
+ * Copyright 2018-2023 Denis Haev (bluefox) <dogafox@gmail.com>
+ *
+ * MIT License
+ *
+ **/
+
+html {
+    height: 100%;
+}
+
+body {
+    margin: 0;
+    padding: 0;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
+        'Droid Sans', 'Helvetica Neue', sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+/* scrollbar */
+::-webkit-scrollbar-track {
+    background-color: #ccc;
+    border-radius: 5px;
+}
+
+::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+    background-color: #ccc;
+}
+
+::-webkit-scrollbar-thumb {
+    background-color: #575757;
+    border-radius: 5px;
+}
+
+#root {
+    height: 100%;
+}
+
+.App {
+    height: 100%;
+}
+
+@keyframes glow {
+    from {
+        background-color: initial;
+    }
+    to {
+        background-color: #58c458;
+    }
+}

package/modulefederation.admin.config.js

@@ -1,33 +1,33 @@
-function makeShared(pkgs) {
-    const result = {};
-    pkgs.forEach(packageName => {
-        result[packageName] = {
-            requiredVersion: '*',
-            singleton: true,
-        };
-    });
-    return result;
-}
-
-// Admin shares these modules for all components
-module.exports = {
-    shared: makeShared([
-        '@emotion/react',
-        '@emotion/styled',
-        '@iobroker/adapter-react-v5',
-        '@iobroker/json-config',
-        '@iobroker/dm-gui-components',
-        '@mui/icons-material',
-        '@mui/material',
-        '@mui/x-date-pickers',
-        'date-fns/locale',
-        'leaflet',
-        'leaflet-geosearch',
-        'prop-types',
-        'react',
-        'react-ace',
-        'react-dom',
-        'react-dropzone',
-        'semver',
-    ]),
-};
+function makeShared(pkgs) {
+    const result = {};
+    pkgs.forEach(packageName => {
+        result[packageName] = {
+            requiredVersion: '*',
+            singleton: true,
+        };
+    });
+    return result;
+}
+
+// Admin shares these modules for all components
+module.exports = {
+    shared: makeShared([
+        '@emotion/react',
+        '@emotion/styled',
+        '@iobroker/adapter-react-v5',
+        '@iobroker/json-config',
+        '@iobroker/dm-gui-components',
+        '@mui/icons-material',
+        '@mui/material',
+        '@mui/x-date-pickers',
+        'date-fns/locale',
+        'leaflet',
+        'leaflet-geosearch',
+        'prop-types',
+        'react',
+        'react-ace',
+        'react-dom',
+        'react-dropzone',
+        'semver',
+    ]),
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@iobroker/adapter-react-v5",
-    "version": "7.4.22",
+    "version": "7.5.1",
     "description": "React components to develop ioBroker interfaces with react.",
     "author": {
         "name": "bluefox",
@@ -59,7 +59,7 @@
         "@emotion/styled": "^11.14.0",
         "@iobroker/js-controller-common": "^7.0.6",
         "@iobroker/js-controller-common-db": "^7.0.6",
-        "@iobroker/socket-client": "^4.0.1",
+        "@iobroker/socket-client": "4.0.21",
         "@iobroker/types": "^7.0.6",
         "@mui/icons-material": "^6.4.5",
         "@mui/material": "^6.4.5",
@@ -69,7 +69,7 @@
         "react-color": "^2.19.3",
         "react-colorful": "^5.6.1",
         "react-cropper": "^2.3.3",
-        "react-dropzone": "^14.3.5",
+        "react-dropzone": "^14.3.6",
         "react-inlinesvg": "^4.2.0"
     },
     "devDependencies": {
@@ -86,6 +86,5 @@
         "ajv": "^8.17.1",
         "ts-node": "^10.9.2",
         "typescript": "^5.7.3"
-    },
-    "gitHead": "294088f7d04b508a3a1a90959299b7a107025585"
+    }
 }

package/tasksExample.js

@@ -1,91 +1,91 @@
-/**
- * Copyright 2024 bluefox <dogafox@gmail.com>
- *
- * MIT License
- *
- */
-'use strict';
-
-const fs = require('node:fs');
-const { deleteFoldersRecursive, npmInstall, buildReact, copyFiles } = require('@iobroker/build-tools');
-
-const SRC = 'src';
-
-function copyAllFiles() {
-    deleteFoldersRecursive('admin', ['.png', '.json', 'i18n']);
-
-    copyFiles(
-        [
-            `${SRC}/build/*`,
-            `!${SRC}/build/index.html`,
-            `!${SRC}/build/static/js/main.*.chunk.js`,
-            `!${SRC}/build/static/media/*.svg`,
-            `!${SRC}/build/static/media/*.txt`,
-            `!${SRC}/build/i18n/*`,
-            `!${SRC}/build/i18n`,
-        ],
-        'admin',
-    );
-
-    copyFiles(`${SRC}/build/index.html`, 'admin');
-
-    copyFiles(`${SRC}/build/static/js/main.*.chunk.js`, 'admin/static/js');
-}
-
-function clean() {
-    deleteFoldersRecursive('admin', ['.png', '.json', 'i18n']);
-    deleteFoldersRecursive(`${SRC}/build`);
-}
-
-function installNpmLocal() {
-    if (fs.existsSync(`${SRC}/node_modules`)) {
-        return Promise.resolve();
-    }
-    return npmInstall(`${__dirname.replace(/\\/g, '/')}/${SRC}/`);
-}
-
-function patchFiles() {
-    if (fs.existsSync(`${__dirname}/admin/index.html`)) {
-        let code = fs.readFileSync(`${__dirname}/admin/index.html`).toString('utf8');
-        code = code.replace(
-            /<script>var script=document\.createElement\("script"\).+?<\/script>/,
-            `<script type="text/javascript" src="./../../lib/js/socket.io.js"></script>`,
-        );
-
-        fs.writeFileSync(`${__dirname}/admin/index.html`, code);
-    }
-    if (fs.existsSync(`${__dirname}/${SRC}/build/index.html`)) {
-        let code = fs.readFileSync(`${__dirname}/${SRC}/build/index.html`).toString('utf8');
-        code = code.replace(
-            /<script>var script=document\.createElement\("script"\).+?<\/script>/,
-            `<script type="text/javascript" src="./../../lib/js/socket.io.js"></script>`,
-        );
-
-        fs.writeFileSync(`${SRC}/build/index.html`, code);
-    }
-}
-
-if (process.argv.find(arg => arg === '--0-clean')) {
-    clean();
-} else if (process.argv.find(arg => arg === '--1-npm')) {
-    npmInstall(`${__dirname.replace(/\\/g, '/')}/${SRC}/`).catch(e => {
-        console.error(`Cannot install: ${e}`);
-        process.exit(1);
-    });
-} else if (process.argv.find(arg => arg === '--2-build')) {
-    buildReact(SRC, { rootDir: __dirname }).catch(e => {
-        console.error(`Cannot build: ${e}`);
-        process.exit(1);
-    });
-} else if (process.argv.find(arg => arg === '--3-copy')) {
-    copyAllFiles();
-} else if (process.argv.find(arg => arg === '--4-patch')) {
-    patchFiles();
-} else {
-    clean();
-
-    installNpmLocal()
-        .then(() => buildReact(SRC, { rootDir: __dirname }))
-        .then(() => copyAllFiles())
-        .then(() => patchFiles());
-}
+/**
+ * Copyright 2024 bluefox <dogafox@gmail.com>
+ *
+ * MIT License
+ *
+ */
+'use strict';
+
+const fs = require('node:fs');
+const { deleteFoldersRecursive, npmInstall, buildReact, copyFiles } = require('@iobroker/build-tools');
+
+const SRC = 'src';
+
+function copyAllFiles() {
+    deleteFoldersRecursive('admin', ['.png', '.json', 'i18n']);
+
+    copyFiles(
+        [
+            `${SRC}/build/*`,
+            `!${SRC}/build/index.html`,
+            `!${SRC}/build/static/js/main.*.chunk.js`,
+            `!${SRC}/build/static/media/*.svg`,
+            `!${SRC}/build/static/media/*.txt`,
+            `!${SRC}/build/i18n/*`,
+            `!${SRC}/build/i18n`,
+        ],
+        'admin',
+    );
+
+    copyFiles(`${SRC}/build/index.html`, 'admin');
+
+    copyFiles(`${SRC}/build/static/js/main.*.chunk.js`, 'admin/static/js');
+}
+
+function clean() {
+    deleteFoldersRecursive('admin', ['.png', '.json', 'i18n']);
+    deleteFoldersRecursive(`${SRC}/build`);
+}
+
+function installNpmLocal() {
+    if (fs.existsSync(`${SRC}/node_modules`)) {
+        return Promise.resolve();
+    }
+    return npmInstall(`${__dirname.replace(/\\/g, '/')}/${SRC}/`);
+}
+
+function patchFiles() {
+    if (fs.existsSync(`${__dirname}/admin/index.html`)) {
+        let code = fs.readFileSync(`${__dirname}/admin/index.html`).toString('utf8');
+        code = code.replace(
+            /<script>var script=document\.createElement\("script"\).+?<\/script>/,
+            `<script type="text/javascript" src="./../../lib/js/socket.io.js"></script>`,
+        );
+
+        fs.writeFileSync(`${__dirname}/admin/index.html`, code);
+    }
+    if (fs.existsSync(`${__dirname}/${SRC}/build/index.html`)) {
+        let code = fs.readFileSync(`${__dirname}/${SRC}/build/index.html`).toString('utf8');
+        code = code.replace(
+            /<script>var script=document\.createElement\("script"\).+?<\/script>/,
+            `<script type="text/javascript" src="./../../lib/js/socket.io.js"></script>`,
+        );
+
+        fs.writeFileSync(`${SRC}/build/index.html`, code);
+    }
+}
+
+if (process.argv.find(arg => arg === '--0-clean')) {
+    clean();
+} else if (process.argv.find(arg => arg === '--1-npm')) {
+    npmInstall(`${__dirname.replace(/\\/g, '/')}/${SRC}/`).catch(e => {
+        console.error(`Cannot install: ${e}`);
+        process.exit(1);
+    });
+} else if (process.argv.find(arg => arg === '--2-build')) {
+    buildReact(SRC, { rootDir: __dirname }).catch(e => {
+        console.error(`Cannot build: ${e}`);
+        process.exit(1);
+    });
+} else if (process.argv.find(arg => arg === '--3-copy')) {
+    copyAllFiles();
+} else if (process.argv.find(arg => arg === '--4-patch')) {
+    patchFiles();
+} else {
+    clean();
+
+    installNpmLocal()
+        .then(() => buildReact(SRC, { rootDir: __dirname }))
+        .then(() => copyAllFiles())
+        .then(() => patchFiles());
+}