@iobroker/adapter-react-v5 4.13.7 → 4.13.8

package/Components/ComplexCron.js

@@ -189,7 +189,7 @@ class ComplexCron extends react_1.Component {
                 hours: null,
                 dates: null,
                 months: null,
-                dows: null,
+                dow: null,
             },
         };
         Object.assign(this.state, state);
@@ -208,7 +208,7 @@ class ComplexCron extends react_1.Component {
                 hours: cronParts[2] || '*',
                 dates: cronParts[3] || '*',
                 months: cronParts[4] || '*',
-                dows: cronParts[5] || '*',
+                dow: cronParts[5] || '*',
             };
         }
         else {
@@ -218,13 +218,13 @@ class ComplexCron extends react_1.Component {
                 hours: cronParts[1] || '*',
                 dates: cronParts[2] || '*',
                 months: cronParts[3] || '*',
-                dows: cronParts[4] || '*',
+                dow: cronParts[4] || '*',
             };
         }
         return options;
     }
     static state2cron(state) {
-        let text = `${state.minutes} ${state.hours} ${state.dates} ${state.months} ${state.dows}`;
+        let text = `${state.minutes} ${state.hours} ${state.dates} ${state.months} ${state.dow}`;
         if (state.seconds !== false) {
             text = `${state.seconds} ${text}`;
         }
@@ -370,8 +370,8 @@ class ComplexCron extends react_1.Component {
             else if (attr === 'months') {
                 this.setState({ months: value, modes }, () => this.recalcCron());
             }
-            else if (attr === 'dows') {
-                this.setState({ dows: value, modes }, () => this.recalcCron());
+            else if (attr === 'dow') {
+                this.setState({ dow: value, modes }, () => this.recalcCron());
             }
             else {
                 this.setState({ modes }, () => this.recalcCron());
@@ -393,8 +393,8 @@ class ComplexCron extends react_1.Component {
             else if (attr === 'months') {
                 this.setState({ months: value }, () => this.recalcCron());
             }
-            else if (attr === 'dows') {
-                this.setState({ dows: value }, () => this.recalcCron());
+            else if (attr === 'dow') {
+                this.setState({ dow: value }, () => this.recalcCron());
             }
         }
     }
@@ -412,13 +412,13 @@ class ComplexCron extends react_1.Component {
                     react_1.default.createElement(material_1.Tab, { id: "hours", label: i18n_1.default.t('sc_hours') }),
                     react_1.default.createElement(material_1.Tab, { id: "dates", label: i18n_1.default.t('sc_dates') }),
                     react_1.default.createElement(material_1.Tab, { id: "months", label: i18n_1.default.t('sc_months') }),
-                    react_1.default.createElement(material_1.Tab, { id: "dows", label: i18n_1.default.t('sc_dows') }))),
+                    react_1.default.createElement(material_1.Tab, { id: "dow", label: i18n_1.default.t('sc_dows') }))),
             tab === 0 && react_1.default.createElement("div", { className: this.props.classes.tabContent }, this.getPeriodsTab('seconds', 60)),
             tab === 1 && react_1.default.createElement("div", { className: this.props.classes.tabContent }, this.getPeriodsTab('minutes', 60)),
             tab === 2 && react_1.default.createElement("div", { className: this.props.classes.tabContent }, this.getPeriodsTab('hours', 24)),
             tab === 3 && react_1.default.createElement("div", { className: this.props.classes.tabContent }, this.getPeriodsTab('dates', 31)),
             tab === 4 && react_1.default.createElement("div", { className: this.props.classes.tabContent }, this.getPeriodsTab('months', 12)),
-            tab === 5 && react_1.default.createElement("div", { className: this.props.classes.tabContent }, this.getPeriodsTab('dows', 7)));
+            tab === 5 && react_1.default.createElement("div", { className: this.props.classes.tabContent }, this.getPeriodsTab('dow', 7)));
     }
 }
 exports.default = (0, styles_1.withStyles)(styles)(ComplexCron);

package/Components/SimpleCron/index.d.ts

@@ -34,6 +34,6 @@ interface SimpleCronState {
         weekdays: number[];
     };
 }
-export declare function cron2state(cron: string): Partial<SimpleCronState> | null;
+export declare function cron2state(cron: string, force?: boolean): Partial<SimpleCronState> | null;
 declare const _default: React.JSXElementConstructor<Omit<SimpleCronProps, "classes"> & import("@mui/styles").StyledComponentProps<string> & object>;
 export default _default;

package/Components/SimpleCron/index.js

@@ -66,7 +66,7 @@ const DEFAULT_STATE = {
         unit: PERIODIC_TYPES.minutes,
     },
 };
-function cron2state(cron) {
+function cron2state(cron, force) {
     cron = cron.replace(/['"]/g, '').trim();
     const cronParts = cron.split(' ');
     let options;
@@ -96,7 +96,8 @@ function cron2state(cron) {
         options.minutes === '*' &&
         options.hours === '*' &&
         options.date === '*' &&
-        options.months === '*') {
+        options.months === '*' &&
+        (options.dow === '*' || force)) {
         state = {
             mode: 'interval',
             interval: {
@@ -109,7 +110,8 @@ function cron2state(cron) {
         options.minutes === '*' &&
         options.hours === '*' &&
         options.date === '*' &&
-        options.months === '*') {
+        options.months === '*' &&
+        (options.dow === '*' || force)) {
         state = {
             mode: 'interval',
             interval: {
@@ -122,7 +124,8 @@ function cron2state(cron) {
         options.minutes.includes('/') &&
         options.hours === '*' &&
         options.date === '*' &&
-        options.months === '*') {
+        options.months === '*' &&
+        (options.dow === '*' || force)) {
         // */n * * * *
         state = {
             mode: 'interval',
@@ -137,7 +140,8 @@ function cron2state(cron) {
         options.minutes === '*' &&
         options.hours === '*' &&
         options.date === '*' &&
-        options.months === '*') {
+        options.months === '*' &&
+        (options.dow === '*' || force)) {
         // */n * * * * *
         state = {
             mode: 'interval',
@@ -152,7 +156,8 @@ function cron2state(cron) {
         options.minutes === '*' &&
         options.hours.includes('-') &&
         options.date === '*' &&
-        options.months === '*') {
+        options.months === '*' &&
+        (options.dow === '*' || force)) {
         // */n * 1-24 * * 1-7 or  */n * 1-24 * * *
         state = {
             mode: 'intervalBetween',
@@ -169,7 +174,8 @@ function cron2state(cron) {
         options.minutes.includes('/') &&
         options.hours.includes('-') &&
         options.date === '*' &&
-        options.months === '*') {
+        options.months === '*' &&
+        (options.dow === '*' || force)) {
         // */n 1-24 * * 1-7 or  */n 1-24 * * *
         state = {
             mode: 'intervalBetween',
@@ -186,7 +192,8 @@ function cron2state(cron) {
         parseInt(options.minutes, 10).toString() === options.minutes &&
         parseInt(options.hours, 10).toString() === options.hours &&
         options.date === '*' &&
-        options.months === '*') {
+        options.months === '*' &&
+        (options.dow === '*' || force)) {
         // m h * * 1-7 or m h * * *
         state = {
             mode: 'specific',
@@ -201,7 +208,7 @@ function cron2state(cron) {
         parseInt(options.hours, 10).toString() === options.hours &&
         parseInt(options.date, 10).toString() === options.date &&
         parseInt(options.months, 10).toString() === options.months &&
-        options.dow === '*') {
+        (options.dow === '*' || force)) {
         // m h d M *
         state = {
             mode: 'once',
@@ -221,7 +228,7 @@ class SimpleCron extends react_1.default.Component {
         if (cron[0] === '{') {
             cron = '';
         }
-        const state = cron2state(cron || '* * * * *') || DEFAULT_STATE;
+        const state = cron2state(cron || '* * * * *', true) || DEFAULT_STATE;
         this.state = {
             extended: false,
             cron: SimpleCron.state2cron(state),

package/README.md

@@ -670,6 +670,9 @@ socket.getObjectViewCustom('custom', 'state', 'startKey', 'endKey')
 -->
 
 ## Changelog
+### 4.13.8 (2024-04-19)
+* (bluefox) Corrected CRON selector
+
 ### 4.13.7 (2024-04-19)
 * (bluefox) Migrated ColorPicker to typescript
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react-v5",
-  "version": "4.13.7",
+  "version": "4.13.8",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "Denis Haev (bluefox)",