@iobroker/adapter-react-v5 6.0.18 → 6.1.0

package/Components/Icon.js

@@ -8,10 +8,10 @@ exports.getSelectIdIcon = getSelectIdIcon;
 exports.default = Icon;
 const react_1 = __importDefault(require("react"));
 const react_inlinesvg_1 = __importDefault(require("react-inlinesvg"));
+const material_1 = require("@mui/material");
 const icons_material_1 = require("@mui/icons-material");
 const IconAlias_1 = __importDefault(require("../icons/IconAlias"));
 const Utils_1 = __importDefault(require("./Utils"));
-const material_1 = require("@mui/material");
 function getSystemIcon(obj) {
     let icon;
     const id = obj === null || obj === void 0 ? void 0 : obj._id;

package/Components/IconPicker.js

@@ -93,7 +93,7 @@ const IconPicker = (props) => {
                             react_1.default.createElement(icons_material_1.Clear, null)))
                     :
                         (!props.disabled && react_1.default.createElement(IconSelector_1.default, { icons: props.icons, onlyRooms: props.onlyRooms, onlyDevices: props.onlyDevices, onSelect: (base64) => props.onChange(base64), t: i18n_1.default.t, lang: i18n_1.default.getLanguage() })),
-                !props.disabled && react_1.default.createElement("div", Object.assign({}, getRootProps(), { style: Object.assign({}, styles.dragField, isDragActive ? { backgroundColor: 'rgba(0, 255, 0, 0.1)' } : { cursor: 'pointer' }) }),
+                !props.disabled && react_1.default.createElement("div", Object.assign({}, getRootProps(), { style: Object.assign(Object.assign({}, styles.dragField), (isDragActive ? { backgroundColor: 'rgba(0, 255, 0, 0.1)' } : { cursor: 'pointer' })) }),
                     react_1.default.createElement("input", Object.assign({}, getInputProps())),
                     isDragActive ?
                         react_1.default.createElement("span", { style: styles.text }, i18n_1.default.t('ra_Drop the files here...')) :

package/Components/MDUtils.js

@@ -3,6 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Copyright 2018-2023 Denis Haev (bluefox) <dogafox@gmail.com>
+ *
+ * MIT License
+ *
+ * */
 const CopyToClipboard_1 = __importDefault(require("./CopyToClipboard"));
 class MDUtils {
     static text2link(text) {

package/Components/Schedule.d.ts

@@ -45,7 +45,7 @@ declare class Schedule extends Component<ScheduleProps, ScheduleState> {
     static state2text(schedule: string | ScheduleConfig): string;
     getTimePeriodElements(): React.JSX.Element;
     getTimeExactElements(): React.JSX.Element;
-    getDivider(): React.JSX.Element;
+    static getDivider(): React.JSX.Element;
     getPeriodModes(): React.JSX.Element[];
     getPeriodSettingsMinutes(): React.JSX.Element;
     getPeriodSettingsWeekdays(): React.JSX.Element[];

package/Components/Schedule.js

@@ -656,7 +656,7 @@ class Schedule extends react_1.Component {
                             this.onChange(_schedule);
                         }, InputLabelProps: { shrink: true }, margin: "normal" })));
     }
-    getDivider() {
+    static getDivider() {
         return react_1.default.createElement("hr", { style: styles.hr });
     }
     getPeriodModes() {
@@ -667,7 +667,7 @@ class Schedule extends react_1.Component {
         }
         return [
             // ----- once ---
-            react_1.default.createElement("div", { key: "once", style: Object.assign({}, styles.rowDiv, styles.rowOnce) },
+            react_1.default.createElement("div", { key: "once", style: Object.assign(Object.assign({}, styles.rowDiv), styles.rowOnce) },
                 react_1.default.createElement("div", { style: styles.modeDiv },
                     react_1.default.createElement(material_1.FormControlLabel, { control: react_1.default.createElement(material_1.Radio, { style: styles.inputRadio, checked: !!isOnce, onClick: () => {
                                 const _schedule = JSON.parse(JSON.stringify(this.state.schedule));
@@ -1172,7 +1172,7 @@ class Schedule extends react_1.Component {
         const schedule = this.state.schedule;
         // ----- from ---
         return react_1.default.createElement("div", { style: styles.rowDiv },
-            react_1.default.createElement("div", { style: Object.assign({}, styles.modeDiv, { verticalAlign: 'middle' }) },
+            react_1.default.createElement("div", { style: Object.assign(Object.assign({}, styles.modeDiv), { verticalAlign: 'middle' }) },
                 react_1.default.createElement("span", { style: { fontWeight: 'bold', paddingRight: 10 } }, i18n_1.default.t('sch_valid')),
                 react_1.default.createElement("span", null, i18n_1.default.t('sch_validFrom'))),
             react_1.default.createElement("div", { style: styles.settingsDiv },
@@ -1229,10 +1229,10 @@ class Schedule extends react_1.Component {
                 react_1.default.createElement("h5", null, i18n_1.default.t('sch_time')),
                 this.getTimePeriodElements(),
                 this.getTimeExactElements(),
-                this.getDivider(),
+                Schedule.getDivider(),
                 react_1.default.createElement("h5", null, i18n_1.default.t('sch_period')),
                 this.getPeriodModes(),
-                !this.state.schedule.period.once && this.getDivider(),
+                !this.state.schedule.period.once && Schedule.getDivider(),
                 !this.state.schedule.period.once && this.getValidSettings()));
     }
 }

package/Components/SimpleCron/cronText.d.ts

@@ -1,2 +1,11 @@
+import 'cronstrue/locales/fr';
+import 'cronstrue/locales/es';
+import 'cronstrue/locales/de';
+import 'cronstrue/locales/it';
+import 'cronstrue/locales/ru';
+import 'cronstrue/locales/zh_CN';
+import 'cronstrue/locales/uk';
+import 'cronstrue/locales/pt_BR';
+import 'cronstrue/locales/pl';
 declare function convertCronToText(cron: string, lang?: ioBroker.Languages): string;
 export default convertCronToText;

package/Components/SimpleCron/cronText.js

@@ -3,50 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cron2text_1 = __importDefault(require("./cron2text"));
-const jquery_cron_locale_1 = __importDefault(require("./jquery.cron.locale"));
-// TODO: other languages
-function correctCasus(text /* , seconds */) {
-    text = text.replace('Каждую(ый) минуту', 'Каждую минуту');
-    text = text.replace('Каждую(ый) минут(у)', 'Каждую минуту');
-    text = text.replace('Каждую(ый) час', 'Каждый час');
-    text = text.replace('Каждую(ый) секунду', 'Каждую секунду');
-    text = text.replace(/ (\d{1,2}) числа/, ' $1го числа');
-    text = text.replace(/ (\d{1,2}) в Январе/, ' $1го числа в Январе');
-    text = text.replace(/ (\d{1,2}) в Феврале/, ' $1го числа в Феврале');
-    text = text.replace(/ (\d{1,2}) в Марте/, ' $1го числа в Марте');
-    text = text.replace(/ (\d{1,2}) в Апреле/, ' $1го числа в Апреле');
-    text = text.replace(/ (\d{1,2}) в Майе/, ' $1го числа в Майе');
-    text = text.replace(/ (\d{1,2}) в Июне/, ' $1го числа в Июне');
-    text = text.replace(/ (\d{1,2}) в Июле/, ' $1го числа в Июле');
-    text = text.replace(/ (\d{1,2}) в Августе/, ' $1го числа в Августе');
-    text = text.replace(/ (\d{1,2}) в Сентябре/, ' $1го числа в Сентябре');
-    text = text.replace(/ (\d{1,2}) в Октябре/, ' $1го числа в Октябре');
-    text = text.replace(/ (\d{1,2}) в Ноябре/, ' $1го числа в Ноябре');
-    text = text.replace(/ (\d{1,2}) в Декабре/, ' $1го числа в Декабре');
-    text = text.replace('Каждую(ый) 0 минуту', 'Каждые ноль минут');
-    text = text.replace(/Каждую\(ый\) ([\d\sи,]+) минуту/, 'Каждую $1 минуту');
-    text = text.replace(/каждой\(го\) ([\d\sи,]+) минуту/, 'каждой $1 минуты');
-    text = text.replace('каждой(го) минут(у)', 'каждой минуты');
-    text = text.replace(' 0 часа(ов)', ' 0 часов');
-    text = text.replace(' 1 часа(ов)', ' 1 час');
-    text = text.replace(' 2 часа(ов)', ' 2 часа');
-    text = text.replace(' 3 часа(ов)', ' 3 часа');
-    text = text.replace(' 4 часа(ов)', ' 4 часа');
-    text = text.replace(/ (\d{1,2}) часа\(ов\)/, ' $1 часов');
-    text = text.replace('Jede(r) Sekunde', 'Jede Sekunde');
-    text = text.replace(/Jede\(r\) ([\d\sund,]+) Sekunde/, 'Jede $1 Sekunde');
-    text = text.replace('Jede(r) Minute', 'Jede Minute');
-    text = text.replace('Jede Minuten', 'Jede Minute');
-    text = text.replace('Jede(r) Stunde', 'Jede Stunde');
-    text = text.replace(/Jede\(r\) ([\d\sund,]+) Minute/, 'Jede $1 Minute');
-    text = text.replace('Jede Sekunde in Minuten', 'Jede Sekunde in jeder Minute');
-    return text;
-}
+const cronstrue_1 = __importDefault(require("cronstrue"));
+require("cronstrue/locales/fr");
+require("cronstrue/locales/es");
+require("cronstrue/locales/de");
+require("cronstrue/locales/it");
+require("cronstrue/locales/ru");
+require("cronstrue/locales/zh_CN");
+require("cronstrue/locales/uk");
+require("cronstrue/locales/pt_BR");
+require("cronstrue/locales/pl");
 function convertCronToText(cron, lang) {
-    const withSeconds = cron.split(' ').length === 6;
-    const locale = (lang && jquery_cron_locale_1.default[lang]) || jquery_cron_locale_1.default.en;
-    const text = (0, cron2text_1.default)(cron, withSeconds, locale);
-    return correctCasus(text /* , withSeconds */);
+    return cronstrue_1.default.toString(cron, { locale: lang });
 }
 exports.default = convertCronToText;

package/Components/SimpleCron/index.js

@@ -59,6 +59,36 @@ const DEFAULT_STATE = {
         unit: PERIODIC_TYPES.minutes,
     },
 };
+function text2weekdays(text) {
+    if (text === '*') {
+        return [0, 1, 2, 3, 4, 5, 6];
+    }
+    const parts = text.split(',');
+    const list = [];
+    parts.forEach(part => {
+        const _parts = part.split('-');
+        if (_parts.length === 2) {
+            const start = parseInt(_parts[0], 10);
+            const end = parseInt(_parts[1], 10);
+            for (let day = start; day <= end; day++) {
+                if (!list.includes(day === 7 ? 0 : day)) {
+                    list.push(day === 7 ? 0 : day);
+                }
+            }
+        }
+        else {
+            if (part === '7') {
+                part = '0';
+            }
+            const numPart = parseInt(part, 10);
+            if (!list.includes(numPart)) {
+                list.push(numPart);
+            }
+        }
+    });
+    list.sort();
+    return list;
+}
 function cron2state(cron, force) {
     cron = cron.replace(/['"]/g, '').trim();
     const cronParts = cron.split(' ');
@@ -159,7 +189,7 @@ function cron2state(cron, force) {
                 unit: PERIODIC_TYPES.seconds,
                 timeFrom: parseInt(options.hours.split('-')[0], 10),
                 timeTo: parseInt(options.hours.split('-')[1], 10),
-                weekdays: SimpleCron.text2weekdays(options.dow),
+                weekdays: text2weekdays(options.dow),
             },
         };
     }
@@ -177,7 +207,7 @@ function cron2state(cron, force) {
                 unit: PERIODIC_TYPES.minutes,
                 timeFrom: parseInt(options.hours.split('-')[0], 10),
                 timeTo: parseInt(options.hours.split('-')[1], 10),
-                weekdays: SimpleCron.text2weekdays(options.dow),
+                weekdays: text2weekdays(options.dow),
             },
         };
     }
@@ -192,7 +222,7 @@ function cron2state(cron, force) {
             mode: 'specific',
             specific: {
                 time: `${padding(parseInt(options.hours, 10))}:${padding(parseInt(options.minutes, 10))}`,
-                weekdays: SimpleCron.text2weekdays(options.dow),
+                weekdays: text2weekdays(options.dow),
             },
         };
     }
@@ -286,34 +316,7 @@ class SimpleCron extends react_1.default.Component {
         return text.join(',');
     }
     static text2weekdays(text) {
-        if (text === '*') {
-            return [0, 1, 2, 3, 4, 5, 6];
-        }
-        const parts = text.split(',');
-        const list = [];
-        parts.forEach(part => {
-            const _parts = part.split('-');
-            if (_parts.length === 2) {
-                const start = parseInt(_parts[0], 10);
-                const end = parseInt(_parts[1], 10);
-                for (let day = start; day <= end; day++) {
-                    if (!list.includes(day === 7 ? 0 : day)) {
-                        list.push(day === 7 ? 0 : day);
-                    }
-                }
-            }
-            else {
-                if (part === '7') {
-                    part = '0';
-                }
-                const numPart = parseInt(part, 10);
-                if (!list.includes(numPart)) {
-                    list.push(numPart);
-                }
-            }
-        });
-        list.sort();
-        return list;
+        return text2weekdays(text);
     }
     static state2cron(state) {
         let cron = '* * * * *';

package/Components/TextWithIcon.js

@@ -110,7 +110,7 @@ const TextWithIcon = (props) => {
         color: Utils_1.default.getInvertedColor(item === null || item === void 0 ? void 0 : item.color, props.themeType || 'light', true) || undefined,
         backgroundColor: item === null || item === void 0 ? void 0 : item.color,
     } : {};
-    return react_1.default.createElement("div", { style: Object.assign({}, props.style, styles.div, style), className: Utils_1.default.clsx(props.className, (_g = props.moreClasses) === null || _g === void 0 ? void 0 : _g.root), title: props.title || item.value },
+    return react_1.default.createElement("div", { style: Object.assign(Object.assign(Object.assign({}, (props.style || undefined)), styles.div), (style || undefined)), className: Utils_1.default.clsx(props.className, (_g = props.moreClasses) === null || _g === void 0 ? void 0 : _g.root), title: props.title || item.value },
         (item === null || item === void 0 ? void 0 : item.icon) ? react_1.default.createElement(Icon_1.default, { src: item === null || item === void 0 ? void 0 : item.icon, className: (_h = props.moreClasses) === null || _h === void 0 ? void 0 : _h.icon, style: styles.icon }) : null,
         react_1.default.createElement("div", { style: styles.text, className: (_j = props.moreClasses) === null || _j === void 0 ? void 0 : _j.text }, item === null || item === void 0 ? void 0 : item.name));
 };

package/Components/TreeTable.d.ts

@@ -70,7 +70,7 @@ declare class TreeTable extends Component<TreeTableProps, TreeTableState> {
     renderCellEditObjectID(col: Column, val: string): React.JSX.Element;
     static renderCellNonEdit(item: Record<string, any>, col: Column): any;
     renderCell(item: Record<string, any>, col: Column, level: number, i: number): React.JSX.Element;
-    renderCellWithSubField(item: Record<string, any>, col: Column): React.JSX.Element;
+    static renderCellWithSubField(item: Record<string, any>, col: Column): React.JSX.Element;
     renderLine(item: Record<string, any>, level?: number): React.JSX.Element | React.JSX.Element[] | null;
     handleRequestSort(property: string): void;
     renderHead(): React.JSX.Element;

package/Components/TreeTable.js

@@ -91,8 +91,8 @@ const styles = {
     },
     cellHeader: {
         fontWeight: 'bold',
-        background: (theme) => theme.palette.mode === 'dark' ? '#888' : '#888',
-        color: (theme) => theme.palette.mode === 'dark' ? '#EEE' : '#111',
+        background: (theme) => (theme.palette.mode === 'dark' ? '#888' : '#888'),
+        color: (theme) => (theme.palette.mode === 'dark' ? '#EEE' : '#111'),
         height: 48,
         wordBreak: 'break-word',
         whiteSpace: 'pre',
@@ -347,13 +347,13 @@ class TreeTable extends react_1.Component {
         }
         return react_1.default.createElement(material_1.TableCell, { key: col.field, style: Object.assign(Object.assign(Object.assign({}, styles.cell), (level ? styles.cellSecondary : undefined)), col.cellStyle), component: "th" }, TreeTable.renderCellNonEdit(item, col));
     }
-    renderCellWithSubField(item, col) {
+    static renderCellWithSubField(item, col) {
         const main = getAttr(item, col.field, col.lookup);
         if (col.subField) {
             const sub = getAttr(item, col.subField, col.subLookup);
             return react_1.default.createElement("div", null,
                 react_1.default.createElement("div", { style: styles.mainText }, main),
-                react_1.default.createElement("div", { style: Object.assign({}, styles.subText, col.subStyle || {}) }, sub));
+                react_1.default.createElement("div", { style: Object.assign(Object.assign({}, styles.subText), (col.subStyle || undefined)) }, sub));
         }
         return react_1.default.createElement("div", null,
             react_1.default.createElement("div", { style: styles.mainText }, main));
@@ -389,7 +389,7 @@ class TreeTable extends react_1.Component {
                     this.setState({ opened: _opened });
                 }, size: "small" }, opened ? react_1.default.createElement(icons_material_1.ExpandMore, null) : react_1.default.createElement(icons_material_1.NavigateNext, null)) : null),
             react_1.default.createElement(material_1.TableCell, { scope: "row", style: Object.assign(Object.assign(Object.assign(Object.assign({}, styles.cell), (level ? styles.cellSecondary : undefined)), this.props.columns[0].cellStyle), { paddingLeft: levelShift * level }) }, this.props.columns[0].subField ?
-                this.renderCellWithSubField(item, this.props.columns[0])
+                TreeTable.renderCellWithSubField(item, this.props.columns[0])
                 :
                     getAttr(item, this.props.columns[0].field, this.props.columns[0].lookup)),
             this.props.columns.map((col, ii) => (!ii && !col.hidden ? null : this.renderCell(item, col, level, i))),

package/Components/UploadImage.js

@@ -482,9 +482,9 @@ class UploadImage extends react_1.Component {
                 else {
                     this.onDrop(acceptedFiles);
                 }
-            } }, ({ getRootProps, getInputProps }) => react_1.default.createElement("div", Object.assign({ style: Object.assign({}, styles.uploadDiv, uploadFile === 'dragging' ? styles.uploadDivDragging : {}, styles.dropZone, disabled ? styles.disabledOpacity : {}, !icon ? styles.dropZoneEmpty : {}) }, getRootProps()),
+            } }, ({ getRootProps, getInputProps }) => react_1.default.createElement("div", Object.assign({ style: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, styles.uploadDiv), (uploadFile === 'dragging' ? styles.uploadDivDragging : undefined)), styles.dropZone), (disabled ? styles.disabledOpacity : undefined)), (!icon ? styles.dropZoneEmpty : undefined)) }, getRootProps()),
             react_1.default.createElement("input", Object.assign({}, getInputProps())),
-            react_1.default.createElement("div", { style: Object.assign({}, styles.uploadCenterDiv, error ? styles.error : {}) },
+            react_1.default.createElement("div", { style: Object.assign(Object.assign({}, styles.uploadCenterDiv), (error ? styles.error : undefined)) },
                 !icon ? react_1.default.createElement("div", { style: styles.uploadCenterTextAndIcon },
                     react_1.default.createElement(fa_1.FaFileUpload, { style: styles.uploadCenterIcon }),
                     react_1.default.createElement("div", { style: styles.uploadCenterText }, uploadFile === 'dragging' ? i18n_1.default.t('ra_Drop file here') :

package/Dialogs/Confirm.d.ts

@@ -6,9 +6,10 @@
  * */
 import React, { Component } from 'react';
 interface DialogConfirmProps {
+    /** The dialog title; default: Are you sure? (translated) */
     title?: string;
     /** The dialog text */
-    text: string | React.JSX.Element;
+    text?: string | React.JSX.Element;
     /** Close handler. */
     onClose?: (ok: boolean) => void;
     /** if the dialog must be fill sized */

package/GenericApp.d.ts

@@ -78,8 +78,8 @@ declare class GenericApp<TProps extends GenericAppProps = GenericAppProps, TStat
      * Get the theme type
      */
     getThemeType(currentTheme: IobTheme): ThemeType;
-    onThemeChanged(newThemeName: string): void;
-    onToggleExpertMode(expertMode: boolean): void;
+    onThemeChanged(_newThemeName: string): void;
+    onToggleExpertMode(_expertMode: boolean): void;
     /**
      * Changes the current theme
      * */

package/GenericApp.js

@@ -415,9 +415,9 @@ class GenericApp extends Router_1.default {
     getThemeType(currentTheme) {
         return currentTheme.palette.mode;
     }
-    onThemeChanged(newThemeName) {
+    onThemeChanged(_newThemeName) {
     }
-    onToggleExpertMode(expertMode) {
+    onToggleExpertMode(_expertMode) {
     }
     /**
      * Changes the current theme

package/README.md

@@ -781,7 +781,10 @@ The best practice is to replace `padding` with `p` and `margin` with `m`, so you
 -->
 
 ## Changelog
-### 6.0.18 (2024-07-14)
+### 6.1.0 (2024-07-15)
+* (bluefox) Replace by CRON to text the package to `cronstrue`
+
+### 6.0.19 (2024-07-14)
 * (bluefox) added some packages for federation
 
 ### 6.0.17 (2024-07-14)

package/modulefederation.admin.config.js

@@ -17,11 +17,7 @@ module.exports = {
         '@iobroker/dm-gui-components',
         '@mui/icons-material',
         '@mui/material',
-        '@mui/material/styles',
-        '@mui/material/colors',
-        '@mui/styles',
-        '@mui/styles/withStyles',
-        '@mui/x-date-pickers/AdapterDateFns',
+        '@mui/x-date-pickers',
         'date-fns/locale',
         'leaflet',
         'leaflet-geosearch',
@@ -30,6 +26,6 @@ module.exports = {
         'react-ace',
         'react-dom',
         'react-dropzone',
-        'semver'
+        'semver',
     ]),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react-v5",
-  "version": "6.0.18",
+  "version": "6.1.0",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "Denis Haev (bluefox)",
@@ -37,6 +37,7 @@
     "@mui/material": "^5.16.1",
     "@mui/x-date-pickers": "^7.10.0",
     "@sentry/browser": "^8.17.0",
+    "cronstrue": "^2.50.0",
     "react-color": "^2.19.3",
     "react-colorful": "^5.6.1",
     "react-cropper": "^2.3.3",

package/Components/SimpleCron/cron2text.d.ts

@@ -1,6 +0,0 @@
-import { CRON_LOCALE } from './jquery.cron.locale';
-/**
- * Given a cronSpec, return the human-readable string.
- */
-declare function cronToText(cronSpec: string, withSeconds: boolean, locale: CRON_LOCALE): string;
-export default cronToText;