@iobroker/adapter-react-v5 7.1.0 → 7.1.3

package/src/Components/TabContainer.tsx

@@ -1,57 +1,57 @@
-import React from 'react';
-
-import { Grid, Paper } from '@mui/material';
-
-const styles: Record<string, React.CSSProperties> = {
-    root: {
-        width: '100%',
-        height: '100%',
-    },
-    overflowHidden: {
-        overflow: 'hidden',
-    },
-    container: {
-        height: '100%',
-    },
-};
-
-interface TabContainerProps {
-    /* The elevation of the tab container. */
-    elevation?: number;
-    /* Set to 'visible' show the overflow. */
-    overflow?: string;
-    styles?: {
-        root?: React.CSSProperties;
-        container?: React.CSSProperties;
-    };
-    onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void;
-    tabIndex?: number;
-    /** The content of the component. */
-    children: React.ReactNode;
-}
-
-function TabContainer(props: TabContainerProps): React.JSX.Element {
-    return (
-        <Paper
-            elevation={!Number.isNaN(props.elevation) ? props.elevation : 1}
-            style={{
-                ...styles.root,
-                ...(props.styles?.root || undefined),
-                ...(props.overflow !== 'visible' ? styles.overflowHidden : undefined),
-            }}
-            onKeyDown={props.onKeyDown}
-            tabIndex={props.tabIndex}
-        >
-            <Grid
-                container
-                direction="column"
-                wrap="nowrap"
-                sx={styles.container}
-            >
-                {props.children}
-            </Grid>
-        </Paper>
-    );
-}
-
-export default TabContainer;
+import React from 'react';
+
+import { Grid2, Paper } from '@mui/material';
+
+const styles: Record<string, React.CSSProperties> = {
+    root: {
+        width: '100%',
+        height: '100%',
+    },
+    overflowHidden: {
+        overflow: 'hidden',
+    },
+    container: {
+        height: '100%',
+    },
+};
+
+interface TabContainerProps {
+    /* The elevation of the tab container. */
+    elevation?: number;
+    /* Set to 'visible' show the overflow. */
+    overflow?: string;
+    styles?: {
+        root?: React.CSSProperties;
+        container?: React.CSSProperties;
+    };
+    onKeyDown?: (event: React.KeyboardEvent<HTMLDivElement>) => void;
+    tabIndex?: number;
+    /** The content of the component. */
+    children: React.ReactNode;
+}
+
+function TabContainer(props: TabContainerProps): React.JSX.Element {
+    return (
+        <Paper
+            elevation={!Number.isNaN(props.elevation) ? props.elevation : 1}
+            style={{
+                ...styles.root,
+                ...(props.styles?.root || undefined),
+                ...(props.overflow !== 'visible' ? styles.overflowHidden : undefined),
+            }}
+            onKeyDown={props.onKeyDown}
+            tabIndex={props.tabIndex}
+        >
+            <Grid2
+                container
+                direction="column"
+                wrap="nowrap"
+                sx={styles.container}
+            >
+                {props.children}
+            </Grid2>
+        </Paper>
+    );
+}
+
+export default TabContainer;

package/src/Dialogs/ComplexCron.tsx

@@ -1,123 +1,163 @@
-import React, { type JSX } from 'react';
-
-import { Button, DialogTitle, DialogContent, DialogActions, Dialog } from '@mui/material';
-
-import { Check as IconOk, Cancel as IconCancel, Delete as IconClear } from '@mui/icons-material';
-
-import ComplexCron from '../Components/ComplexCron';
-
-import I18n from '../i18n';
-
-// Generate cron expression
-const styles: Record<string, React.CSSProperties> = {
-    headerID: {
-        fontWeight: 'bold',
-        fontStyle: 'italic',
-    },
-    radio: {
-        display: 'inline-block',
-    },
-    dialogPaper: {
-        height: 'calc(100% - 96px)',
-    },
-};
-
-interface DialogCronProps {
-    onClose: () => void;
-    onOk: (cron: string | false) => void;
-    title?: string;
-    cron?: string;
-    cancel?: string;
-    ok?: string;
-    clear?: string;
-    clearButton?: boolean;
-}
-
-interface DialogCronState {
-    cron: string;
-}
-
-class DialogComplexCron extends React.Component<DialogCronProps, DialogCronState> {
-    constructor(props: DialogCronProps) {
-        super(props);
-        let cron;
-        if (this.props.cron && typeof this.props.cron === 'string' && this.props.cron.replace(/^["']/, '')[0] !== '{') {
-            cron = this.props.cron.replace(/['"]/g, '').trim();
-        } else {
-            cron = this.props.cron || '{}';
-            if (typeof cron === 'string') {
-                cron = cron.replace(/^["']/, '').replace(/["']\n?$/, '');
-            }
-        }
-
-        this.state = {
-            cron,
-        };
-    }
-
-    handleCancel(): void {
-        this.props.onClose();
-    }
-
-    handleOk(): void {
-        this.props.onOk(this.state.cron);
-        this.props.onClose();
-    }
-
-    handleClear(): void {
-        this.props.onOk(false);
-        this.props.onClose();
-    }
-
-    render(): JSX.Element {
-        return (
-            <Dialog
-                onClose={() => {}}
-                maxWidth="md"
-                fullWidth
-                sx={{ '& .MuiDialog-paper': styles.dialogPaper }}
-                open={!0}
-                aria-labelledby="cron-dialog-title"
-            >
-                <DialogTitle id="cron-dialog-title">{this.props.title || I18n.t('ra_Define schedule...')}</DialogTitle>
-                <DialogContent style={{ height: '100%', overflow: 'hidden' }}>
-                    <ComplexCron
-                        cronExpression={this.state.cron}
-                        onChange={cron => this.setState({ cron })}
-                        language={I18n.getLanguage()}
-                    />
-                </DialogContent>
-                <DialogActions>
-                    {!!this.props.clearButton && (
-                        <Button
-                            color="grey"
-                            variant="contained"
-                            onClick={() => this.handleClear()}
-                            startIcon={<IconClear />}
-                        >
-                            {this.props.clear || I18n.t('ra_Clear')}
-                        </Button>
-                    )}
-                    <Button
-                        variant="contained"
-                        onClick={() => this.handleOk()}
-                        color="primary"
-                        startIcon={<IconOk />}
-                    >
-                        {this.props.ok || I18n.t('ra_Ok')}
-                    </Button>
-                    <Button
-                        color="grey"
-                        variant="contained"
-                        onClick={() => this.handleCancel()}
-                        startIcon={<IconCancel />}
-                    >
-                        {this.props.cancel || I18n.t('ra_Cancel')}
-                    </Button>
-                </DialogActions>
-            </Dialog>
-        );
-    }
-}
-
-export default DialogComplexCron;
+import React, { type JSX } from 'react';
+
+import { Button, DialogTitle, DialogContent, DialogActions, Dialog } from '@mui/material';
+
+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';
+
+// Generate cron expression
+const styles: Record<string, React.CSSProperties> = {
+    headerID: {
+        fontWeight: 'bold',
+        fontStyle: 'italic',
+    },
+    radio: {
+        display: 'inline-block',
+    },
+    dialogPaper: {
+        height: 'calc(100% - 96px)',
+    },
+};
+
+interface DialogCronProps {
+    onClose: () => void;
+    onOk: (cron: string | false) => void;
+    title?: string;
+    cron?: string;
+    cancel?: string;
+    ok?: string;
+    clear?: string;
+    clearButton?: boolean;
+}
+
+interface DialogCronState {
+    cron: string;
+    showWarning: '' | 'everySecond' | 'everyMinute';
+}
+
+class DialogComplexCron extends React.Component<DialogCronProps, DialogCronState> {
+    constructor(props: DialogCronProps) {
+        super(props);
+        let cron;
+        if (this.props.cron && typeof this.props.cron === 'string' && this.props.cron.replace(/^["']/, '')[0] !== '{') {
+            cron = this.props.cron.replace(/['"]/g, '').trim();
+        } else {
+            cron = this.props.cron || '{}';
+            if (typeof cron === 'string') {
+                cron = cron.replace(/^["']/, '').replace(/["']\n?$/, '');
+            }
+        }
+
+        this.state = {
+            showWarning: '',
+            cron,
+        };
+    }
+
+    handleCancel(): void {
+        this.props.onClose();
+    }
+
+    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();
+    }
+
+    render(): JSX.Element {
+        return (
+            <Dialog
+                onClose={() => {}}
+                maxWidth="md"
+                fullWidth
+                sx={{ '& .MuiDialog-paper': styles.dialogPaper }}
+                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
+                        cronExpression={this.state.cron}
+                        onChange={cron => this.setState({ cron })}
+                        language={I18n.getLanguage()}
+                    />
+                </DialogContent>
+                <DialogActions>
+                    {!!this.props.clearButton && (
+                        <Button
+                            color="grey"
+                            variant="contained"
+                            onClick={() => this.handleClear()}
+                            startIcon={<IconClear />}
+                        >
+                            {this.props.clear || I18n.t('ra_Clear')}
+                        </Button>
+                    )}
+                    <Button
+                        variant="contained"
+                        onClick={() => this.handleOk()}
+                        color="primary"
+                        startIcon={<IconOk />}
+                    >
+                        {this.props.ok || I18n.t('ra_Ok')}
+                    </Button>
+                    <Button
+                        color="grey"
+                        variant="contained"
+                        onClick={() => this.handleCancel()}
+                        startIcon={<IconCancel />}
+                    >
+                        {this.props.cancel || I18n.t('ra_Cancel')}
+                    </Button>
+                </DialogActions>
+            </Dialog>
+        );
+    }
+}
+
+export default DialogComplexCron;

package/tasks.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());
+}