@iobroker/adapter-react-v5 7.1.1 → 7.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react-v5",
-  "version": "7.1.1",
+  "version": "7.1.4",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "Denis Haev (bluefox)",
@@ -29,13 +29,13 @@
   "dependencies": {
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@iobroker/socket-client": "^2.4.18",
+    "@iobroker/socket-client": "^3.0.1",
     "@iobroker/types": "^6.0.11",
     "@iobroker/js-controller-common": "^6.0.11",
     "@iobroker/js-controller-common-db": "^6.0.11",
     "@mui/icons-material": "^6.1.0",
     "@mui/material": "^6.1.0",
-    "@mui/x-date-pickers": "^7.16.0",
+    "@mui/x-date-pickers": "^7.17.0",
     "@sentry/browser": "^8.30.0",
     "cronstrue": "^2.50.0",
     "react-color": "^2.19.3",

package/src/Components/ComplexCron.tsx

@@ -36,6 +36,11 @@ const styles: Record<string, React.CSSProperties> = {
     appBar: {
         color: 'white',
     },
+    warning: {
+        marginLeft: 16,
+        color: 'red',
+        fontSize: 12,
+    },
 };
 
 const WEEKDAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
@@ -467,6 +472,11 @@ class ComplexCron extends Component<ComplexCronProps, ComplexCronState> {
 
     render(): React.JSX.Element {
         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 (
             <div style={styles.mainDiv}>
                 <div style={{ paddingLeft: 8, width: '100%' }}>
@@ -479,6 +489,13 @@ class ComplexCron extends Component<ComplexCronProps, ComplexCronState> {
                 </div>
                 <div style={{ paddingLeft: 8, width: '100%', height: 60 }}>
                     {ComplexCron.convertCronToText(this.state.cron, this.props.language || 'en')}
+                    <span style={styles.warning}>
+                        {everySecond
+                            ? I18n.t('ra_warning_every_second')
+                            : everyMinute
+                              ? I18n.t('ra_warning_every_minute')
+                              : ''}
+                    </span>
                 </div>
                 <FormControlLabel
                     control={
@@ -500,7 +517,7 @@ class ComplexCron extends Component<ComplexCronProps, ComplexCronState> {
                         value={this.state.tab}
                         style={styles.appBar}
                         color="secondary"
-                        onChange={(active, _tab) => this.setState({ tab: _tab })}
+                        onChange={(_active, _tab) => this.setState({ tab: _tab })}
                     >
                         {this.state.seconds !== false && (
                             <Tab

package/src/Dialogs/ComplexCron.tsx

@@ -5,6 +5,7 @@ import { Button, DialogTitle, DialogContent, DialogActions, Dialog } from '@mui/
 import { Check as IconOk, Cancel as IconCancel, Delete as IconClear } from '@mui/icons-material';
 
 import ComplexCron from '../Components/ComplexCron';
+import ConfirmDialog from '../Dialogs/Confirm';
 
 import I18n from '../i18n';
 
@@ -35,6 +36,7 @@ interface DialogCronProps {
 
 interface DialogCronState {
     cron: string;
+    showWarning: '' | 'everySecond' | 'everyMinute';
 }
 
 class DialogComplexCron extends React.Component<DialogCronProps, DialogCronState> {
@@ -51,6 +53,7 @@ class DialogComplexCron extends React.Component<DialogCronProps, DialogCronState
         }
 
         this.state = {
+            showWarning: '',
             cron,
         };
     }
@@ -59,11 +62,47 @@ class DialogComplexCron extends React.Component<DialogCronProps, DialogCronState
         this.props.onClose();
     }
 
-    handleOk(): void {
+    handleOk(ignoreCheck?: boolean): void {
+        if (!ignoreCheck) {
+            // Check if the CRON will be executed every second or every minute and warn about it
+            const cron = ComplexCron.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(): JSX.Element | null {
+        if (!this.state.showWarning) {
+            return null;
+        }
+        return (
+            <ConfirmDialog
+                title={I18n.t('ra_Please confirm')}
+                text={I18n.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: boolean) =>
+                    this.setState({ showWarning: '' }, () => {
+                        if (ok) {
+                            this.handleOk(true);
+                        }
+                    })
+                }
+            />
+        );
+    }
+
     handleClear(): void {
         this.props.onOk(false);
         this.props.onClose();
@@ -79,6 +118,7 @@ class DialogComplexCron extends React.Component<DialogCronProps, DialogCronState
                 open={!0}
                 aria-labelledby="cron-dialog-title"
             >
+                {this.renderWarningDialog()}
                 <DialogTitle id="cron-dialog-title">{this.props.title || I18n.t('ra_Define schedule...')}</DialogTitle>
                 <DialogContent style={{ height: '100%', overflow: 'hidden' }}>
                     <ComplexCron