@iobroker/adapter-react-v5 7.1.1 → 7.1.4

package/Components/ComplexCron.js

@@ -61,6 +61,11 @@ const styles = {
     appBar: {
         color: 'white',
     },
+    warning: {
+        marginLeft: 16,
+        color: 'red',
+        fontSize: 12,
+    },
 };
 const WEEKDAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
 const MONTHS = [
@@ -391,13 +396,22 @@ class ComplexCron extends react_1.Component {
     }
     render() {
         const tab = this.state.seconds !== false ? this.state.tab : this.state.tab + 1;
+        // Detect if every minute or every second is activated
+        const everyMinute = this.state.minutes === '*' || this.state.minutes === '*/1';
+        const everySecond = this.state.seconds === '*' || this.state.seconds === '*/1';
         return (react_1.default.createElement("div", { style: styles.mainDiv },
             react_1.default.createElement("div", { style: { paddingLeft: 8, width: '100%' } },
                 react_1.default.createElement(material_1.TextField, { variant: "standard", style: { width: '100%' }, value: this.state.cron, disabled: true })),
-            react_1.default.createElement("div", { style: { paddingLeft: 8, width: '100%', height: 60 } }, ComplexCron.convertCronToText(this.state.cron, this.props.language || 'en')),
+            react_1.default.createElement("div", { style: { paddingLeft: 8, width: '100%', height: 60 } },
+                ComplexCron.convertCronToText(this.state.cron, this.props.language || 'en'),
+                react_1.default.createElement("span", { style: styles.warning }, everySecond
+                    ? i18n_1.default.t('ra_warning_every_second')
+                    : everyMinute
+                        ? i18n_1.default.t('ra_warning_every_minute')
+                        : '')),
             react_1.default.createElement(material_1.FormControlLabel, { control: react_1.default.createElement(material_1.Checkbox, { checked: !!this.state.seconds, onChange: e => this.setState({ seconds: e.target.checked ? '*' : false }, () => this.recalcCron()) }), label: i18n_1.default.t('ra_use seconds') }),
             react_1.default.createElement(material_1.AppBar, { position: "static", sx: { '&.MuiAppBar-root': styles.appBar }, color: "secondary" },
-                react_1.default.createElement(material_1.Tabs, { value: this.state.tab, style: styles.appBar, color: "secondary", onChange: (active, _tab) => this.setState({ tab: _tab }) },
+                react_1.default.createElement(material_1.Tabs, { value: this.state.tab, style: styles.appBar, color: "secondary", onChange: (_active, _tab) => this.setState({ tab: _tab }) },
                     this.state.seconds !== false && (react_1.default.createElement(material_1.Tab, { id: "sc_seconds", label: i18n_1.default.t('sc_seconds') })),
                     react_1.default.createElement(material_1.Tab, { id: "minutes", label: i18n_1.default.t('sc_minutes') }),
                     react_1.default.createElement(material_1.Tab, { id: "hours", label: i18n_1.default.t('sc_hours') }),

package/Dialogs/ComplexCron.d.ts

@@ -11,11 +11,13 @@ interface DialogCronProps {
 }
 interface DialogCronState {
     cron: string;
+    showWarning: '' | 'everySecond' | 'everyMinute';
 }
 declare class DialogComplexCron extends React.Component<DialogCronProps, DialogCronState> {
     constructor(props: DialogCronProps);
     handleCancel(): void;
-    handleOk(): void;
+    handleOk(ignoreCheck?: boolean): void;
+    renderWarningDialog(): JSX.Element | null;
     handleClear(): void;
     render(): JSX.Element;
 }

package/Dialogs/ComplexCron.js

@@ -7,6 +7,7 @@ const react_1 = __importDefault(require("react"));
 const material_1 = require("@mui/material");
 const icons_material_1 = require("@mui/icons-material");
 const ComplexCron_1 = __importDefault(require("../Components/ComplexCron"));
+const Confirm_1 = __importDefault(require("../Dialogs/Confirm"));
 const i18n_1 = __importDefault(require("../i18n"));
 // Generate cron expression
 const styles = {
@@ -35,22 +36,48 @@ class DialogComplexCron extends react_1.default.Component {
             }
         }
         this.state = {
+            showWarning: '',
             cron,
         };
     }
     handleCancel() {
         this.props.onClose();
     }
-    handleOk() {
+    handleOk(ignoreCheck) {
+        if (!ignoreCheck) {
+            // Check if the CRON will be executed every second or every minute and warn about it
+            const cron = ComplexCron_1.default.cron2state(this.state.cron);
+            if (cron.seconds === '*' || cron.seconds === '*/1') {
+                this.setState({ showWarning: 'everySecond' });
+                return;
+            }
+            if (cron.minutes === '*' || cron.minutes === '*/1') {
+                this.setState({ showWarning: 'everyMinute' });
+                return;
+            }
+        }
         this.props.onOk(this.state.cron);
         this.props.onClose();
     }
+    renderWarningDialog() {
+        if (!this.state.showWarning) {
+            return null;
+        }
+        return (react_1.default.createElement(Confirm_1.default, { title: i18n_1.default.t('ra_Please confirm'), text: i18n_1.default.t(this.state.showWarning === 'everySecond'
+                ? 'ra_The schedule will be executed every second. Are you sure?'
+                : 'ra_The schedule will be executed every minute. Are you sure?'), onClose: (ok) => this.setState({ showWarning: '' }, () => {
+                if (ok) {
+                    this.handleOk(true);
+                }
+            }) }));
+    }
     handleClear() {
         this.props.onOk(false);
         this.props.onClose();
     }
     render() {
         return (react_1.default.createElement(material_1.Dialog, { onClose: () => { }, maxWidth: "md", fullWidth: true, sx: { '& .MuiDialog-paper': styles.dialogPaper }, open: !0, "aria-labelledby": "cron-dialog-title" },
+            this.renderWarningDialog(),
             react_1.default.createElement(material_1.DialogTitle, { id: "cron-dialog-title" }, this.props.title || i18n_1.default.t('ra_Define schedule...')),
             react_1.default.createElement(material_1.DialogContent, { style: { height: '100%', overflow: 'hidden' } },
                 react_1.default.createElement(ComplexCron_1.default, { cronExpression: this.state.cron, onChange: cron => this.setState({ cron }), language: i18n_1.default.getLanguage() })),

package/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:
         ```
-        "@iobroker/adapter-react-v5": "^7.1.1",
+        "@iobroker/adapter-react-v5": "^7.1.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.1.1",
+        "@iobroker/adapter-react-v5": "^7.1.4",
         "@iobroker/build-tools": "^1.0.0",
         "@iobroker/eslint-config": "^0.1.2",
         "@mui/material": "^6.0.2",
@@ -697,6 +697,15 @@ You can find the migration instructions:
 -->
 
 ## Changelog
+### 7.1.4 (2024-09-15)
+
+-   (bluefox) Updated socket classes
+
+### 7.1.3 (2024-09-15)
+
+-   (bluefox) Updated socket classes
+-   (bluefox) Added additional confirmation dialog for CRONs for every minute execution
+
 ### 7.1.1 (2024-09-13)
 
 -   (bluefox) Corrected TabContainer