@iobroker/adapter-react-v5 4.6.5 → 4.6.7

package/Components/SimpleCron/index.js

@@ -137,12 +137,12 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
           control: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
             checked: settings.weekdays.indexOf(day) !== -1,
             onChange: function onChange(e) {
-              var settings = JSON.parse(JSON.stringify(_this2.state[type]));
-              var pos = settings.weekdays.indexOf(day);
-              e.target.checked && pos === -1 && settings.weekdays.push(day);
-              !e.target.checked && pos !== -1 && settings.weekdays.splice(pos, 1);
-              settings.weekdays.sort();
-              _this2.setState((0, _defineProperty2["default"])({}, type, settings), function () {
+              var _settings = JSON.parse(JSON.stringify(_this2.state[type]));
+              var pos = _settings.weekdays.indexOf(day);
+              e.target.checked && pos === -1 && _settings.weekdays.push(day);
+              !e.target.checked && pos !== -1 && _settings.weekdays.splice(pos, 1);
+              _settings.weekdays.sort();
+              _this2.setState((0, _defineProperty2["default"])({}, type, _settings), function () {
                 return _this2.recalcCron();
               });
             },
@@ -179,12 +179,12 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
           label: _i18n["default"].t('sc_minutes'),
           value: settings.minutes,
           onChange: function onChange(e) {
-            var settings = JSON.parse(JSON.stringify(_this3.state[type]));
-            settings.minutes = parseInt(e.target.value, 10);
-            if (settings.minutes < 1) {
-              settings.minutes = 1;
+            var _settings = JSON.parse(JSON.stringify(_this3.state[type]));
+            _settings.minutes = parseInt(e.target.value, 10);
+            if (_settings.minutes < 1) {
+              _settings.minutes = 1;
             }
-            _this3.setState((0, _defineProperty2["default"])({}, type, settings), function () {
+            _this3.setState((0, _defineProperty2["default"])({}, type, _settings), function () {
               return _this3.recalcCron();
             });
           },
@@ -223,64 +223,63 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
           },
           margin: "normal"
         }));
-      } else {
-        return /*#__PURE__*/_react["default"].createElement("div", {
-          key: "period",
-          style: {
-            paddingLeft: 8,
-            display: 'inline-block'
-          }
-        }, /*#__PURE__*/_react["default"].createElement("h5", {
-          style: {
-            marginBottom: 5
-          }
-        }, _i18n["default"].t('sc_period')), /*#__PURE__*/_react["default"].createElement(_TextField["default"], {
-          variant: "standard",
-          style: {
-            marginTop: 0,
-            marginBottom: 0,
-            verticalAlign: 'bottom'
-          },
-          key: "value",
-          label: _i18n["default"].t('sc_every'),
-          value: settings.period,
-          onChange: function onChange(e) {
-            var settings = JSON.parse(JSON.stringify(_this3.state[type]));
-            settings.period = parseInt(e.target.value, 10);
-            if (settings.period < 1) {
-              settings.period = 1;
-            }
-            _this3.setState((0, _defineProperty2["default"])({}, type, settings), function () {
-              return _this3.recalcCron();
-            });
-          },
-          min: 1,
-          max: 60,
-          type: "number",
-          InputLabelProps: {
-            shrink: true
-          },
-          margin: "normal"
-        }), /*#__PURE__*/_react["default"].createElement(_Select["default"], {
-          variant: "standard",
-          style: {
-            verticalAlign: 'bottom'
-          },
-          value: settings.unit,
-          onChange: function onChange(e) {
-            var settings = JSON.parse(JSON.stringify(_this3.state[type]));
-            settings.unit = e.target.value;
-            _this3.setState((0, _defineProperty2["default"])({}, type, settings), function () {
-              return _this3.recalcCron();
-            });
-          }
-        }, Object.keys(PERIODIC_TYPES).map(function (mode) {
-          return /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
-            key: PERIODIC_TYPES[mode],
-            value: PERIODIC_TYPES[mode]
-          }, _i18n["default"].t("sc_".concat(PERIODIC_TYPES[mode])));
-        })));
       }
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: "period",
+        style: {
+          paddingLeft: 8,
+          display: 'inline-block'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("h5", {
+        style: {
+          marginBottom: 5
+        }
+      }, _i18n["default"].t('sc_period')), /*#__PURE__*/_react["default"].createElement(_TextField["default"], {
+        variant: "standard",
+        style: {
+          marginTop: 0,
+          marginBottom: 0,
+          verticalAlign: 'bottom'
+        },
+        key: "value",
+        label: _i18n["default"].t('sc_every'),
+        value: settings.period,
+        onChange: function onChange(e) {
+          var settings = JSON.parse(JSON.stringify(_this3.state[type]));
+          settings.period = parseInt(e.target.value, 10);
+          if (settings.period < 1) {
+            settings.period = 1;
+          }
+          _this3.setState((0, _defineProperty2["default"])({}, type, settings), function () {
+            return _this3.recalcCron();
+          });
+        },
+        min: 1,
+        max: 60,
+        type: "number",
+        InputLabelProps: {
+          shrink: true
+        },
+        margin: "normal"
+      }), /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+        variant: "standard",
+        style: {
+          verticalAlign: 'bottom'
+        },
+        value: settings.unit,
+        onChange: function onChange(e) {
+          var _settings = JSON.parse(JSON.stringify(_this3.state[type]));
+          _settings.unit = e.target.value;
+          _this3.setState((0, _defineProperty2["default"])({}, type, _settings), function () {
+            return _this3.recalcCron();
+          });
+        }
+      }, Object.keys(PERIODIC_TYPES).map(function (mode) {
+        return /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
+          key: PERIODIC_TYPES[mode],
+          value: PERIODIC_TYPES[mode]
+        }, _i18n["default"].t("sc_".concat(PERIODIC_TYPES[mode])));
+      })));
     }
   }, {
     key: "getControlsTime",
@@ -300,9 +299,9 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
         value: settings.time,
         type: "time",
         onChange: function onChange(e) {
-          var settings = JSON.parse(JSON.stringify(_this4.state[type]));
-          settings.time = e.target.value;
-          _this4.setState((0, _defineProperty2["default"])({}, type, settings), function () {
+          var _settings = JSON.parse(JSON.stringify(_this4.state[type]));
+          _settings.time = e.target.value;
+          _this4.setState((0, _defineProperty2["default"])({}, type, _settings), function () {
             return _this4.recalcCron();
           });
         },
@@ -322,7 +321,7 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
         settings.date = "".concat(d.getDate(), ".").concat(padding(d.getMonth() + 1));
       }
 
-      //<InputLabel htmlFor="formatted-text-mask-input">{I18n.t('sc_at')}</InputLabel>
+      // <InputLabel htmlFor="formatted-text-mask-input">{I18n.t('sc_at')}</InputLabel>
       return /*#__PURE__*/_react["default"].createElement(_FormControl["default"], {
         variant: "standard",
         className: this.props.classes.formControl
@@ -336,9 +335,9 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
           className: this.props.classes.formControlPaddingTop
         },
         onChange: function onChange(e) {
-          var settings = JSON.parse(JSON.stringify(_this5.state[type]));
-          settings.date = e.target.value;
-          _this5.setState((0, _defineProperty2["default"])({}, type, settings), function () {
+          var _settings = JSON.parse(JSON.stringify(_this5.state[type]));
+          _settings.date = e.target.value;
+          _this5.setState((0, _defineProperty2["default"])({}, type, _settings), function () {
             return _this5.recalcCron();
           });
         },
@@ -391,10 +390,10 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
         },
         value: settings.timeFrom,
         onChange: function onChange(e) {
-          var settings = JSON.parse(JSON.stringify(_this6.state.intervalBetween));
-          settings.timeFrom = parseInt(e.target.value, 10);
+          var _settings = JSON.parse(JSON.stringify(_this6.state.intervalBetween));
+          _settings.timeFrom = parseInt(e.target.value, 10);
           _this6.setState({
-            intervalBetween: settings
+            intervalBetween: _settings
           }, function () {
             return _this6.recalcCron();
           });
@@ -417,10 +416,10 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
         },
         value: settings.timeTo,
         onChange: function onChange(e) {
-          var settings = JSON.parse(JSON.stringify(_this6.state.intervalBetween));
-          settings.timeTo = parseInt(e.target.value, 10);
+          var _settings = JSON.parse(JSON.stringify(_this6.state.intervalBetween));
+          _settings.timeTo = parseInt(e.target.value, 10);
           _this6.setState({
-            intervalBetween: settings
+            intervalBetween: _settings
           }, function () {
             return _this6.recalcCron();
           });
@@ -517,33 +516,32 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
       max = max || 7;
       if (list.length === max) {
         return '*';
-      } else {
-        var text = [];
-        var start = null;
-        var end = null;
-        for (var i = 0; i < list.length; i++) {
-          if (start === null) {
-            start = list[i];
-            end = list[i];
-          } else if (list[i - 1] + 1 === list[i]) {
-            end = list[i];
+      }
+      var text = [];
+      var start = null;
+      var end = null;
+      for (var i = 0; i < list.length; i++) {
+        if (start === null) {
+          start = list[i];
+          end = list[i];
+        } else if (list[i - 1] + 1 === list[i]) {
+          end = list[i];
+        } else {
+          if (start !== end) {
+            text.push("".concat(start, "-").concat(end));
           } else {
-            if (start !== end) {
-              text.push("".concat(start, "-").concat(end));
-            } else {
-              text.push(start);
-            }
-            start = list[i];
-            end = list[i];
+            text.push(start);
           }
+          start = list[i];
+          end = list[i];
         }
-        if (start !== end) {
-          text.push("".concat(start, "-").concat(end));
-        } else {
-          text.push(start);
-        }
-        return text.join(',');
       }
+      if (start !== end) {
+        text.push("".concat(start, "-").concat(end));
+      } else {
+        text.push(start);
+      }
+      return text.join(',');
     }
   }, {
     key: "text2weekdays",
@@ -615,68 +613,61 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
           period: 1,
           unit: PERIODIC_TYPES.seconds
         };
-      } else
+      } else if (options.seconds === null && options.minutes.includes('/') && options.hours === '*' && options.date === '*' && options.months === '*') {
         // */n * * * *
-        if (options.seconds === null && options.minutes.includes('/') && options.hours === '*' && options.date === '*' && options.months === '*') {
-          state.mode = PERIODIC.interval;
-          state.interval = {
-            period: parseInt(options.minutes.split('/')[1], 10),
-            unit: PERIODIC_TYPES.minutes
-          };
-        } else
-          // */n * * * * *
-          if (options.seconds !== null && options.seconds.includes('/') && options.minutes === '*' && options.hours === '*' && options.date === '*' && options.months === '*') {
-            state.mode = PERIODIC.interval;
-            state.interval = {
-              period: parseInt(options.seconds.split('/')[1], 10),
-              unit: PERIODIC_TYPES.seconds
-            };
-          } else
-            // */n * 1-24 * * 1-7 or  */n * 1-24 * * *
-            if (options.seconds !== null && options.seconds.includes('/') && options.minutes === '*' && options.hours.includes('-') && options.date === '*' && options.months === '*') {
-              state.mode = PERIODIC.intervalBetween;
-              state.intervalBetween = {
-                period: parseInt(options.seconds.split('/')[1], 10),
-                unit: PERIODIC_TYPES.seconds,
-                timeFrom: parseInt(options.hours.split('-')[0], 10),
-                timeTo: parseInt(options.hours.split('-')[1], 10),
-                weekdays: SimpleCron.text2weekdays(options.dow)
-              };
-            } else
-              // */n 1-24 * * 1-7 or  */n 1-24 * * *
-              if (options.seconds === null && options.minutes.includes('/') && options.hours.includes('-') && options.date === '*' && options.months === '*') {
-                state.mode = PERIODIC.intervalBetween;
-                state.intervalBetween = {
-                  period: parseInt(options.minutes.split('/')[1], 10),
-                  unit: PERIODIC_TYPES.minutes,
-                  timeFrom: parseInt(options.hours.split('-')[0], 10),
-                  timeTo: parseInt(options.hours.split('-')[1], 10),
-                  weekdays: SimpleCron.text2weekdays(options.dow)
-                };
-              } else
-                // m h * * 1-7 or m h * * *
-                if (options.seconds === null && parseInt(options.minutes, 10).toString() === options.minutes && parseInt(options.hours, 10).toString() === options.hours && options.date === '*' && options.months === '*') {
-                  state.mode = PERIODIC.specific;
-                  state.specific = {
-                    time: "".concat(padding(parseInt(options.hours, 10)), ":").concat(padding(parseInt(options.minutes, 10))),
-                    weekdays: SimpleCron.text2weekdays(options.dow)
-                  };
-                } else
-                  // m h d M *
-                  if (options.seconds === null && parseInt(options.minutes, 10).toString() === options.minutes && parseInt(options.hours, 10).toString() === options.hours && parseInt(options.date, 10).toString() === options.date && parseInt(options.months, 10).toString() === options.months && options.dow === '*') {
-                    state.mode = PERIODIC.once;
-                    state.once = {
-                      time: "".concat(padding(parseInt(options.hours, 10)), ":").concat(padding(parseInt(options.minutes, 10))),
-                      date: "".concat(padding(parseInt(options.date, 10)), ".").concat(padding(parseInt(options.months, 10))),
-                      // ignored
-                      weekdays: SimpleCron.text2weekdays(options.dow)
-                    };
-                  }
+        state.mode = PERIODIC.interval;
+        state.interval = {
+          period: parseInt(options.minutes.split('/')[1], 10),
+          unit: PERIODIC_TYPES.minutes
+        };
+      } else if (options.seconds !== null && options.seconds.includes('/') && options.minutes === '*' && options.hours === '*' && options.date === '*' && options.months === '*') {
+        // */n * * * * *
+        state.mode = PERIODIC.interval;
+        state.interval = {
+          period: parseInt(options.seconds.split('/')[1], 10),
+          unit: PERIODIC_TYPES.seconds
+        };
+      } else if (options.seconds !== null && options.seconds.includes('/') && options.minutes === '*' && options.hours.includes('-') && options.date === '*' && options.months === '*') {
+        // */n * 1-24 * * 1-7 or  */n * 1-24 * * *
+        state.mode = PERIODIC.intervalBetween;
+        state.intervalBetween = {
+          period: parseInt(options.seconds.split('/')[1], 10),
+          unit: PERIODIC_TYPES.seconds,
+          timeFrom: parseInt(options.hours.split('-')[0], 10),
+          timeTo: parseInt(options.hours.split('-')[1], 10),
+          weekdays: SimpleCron.text2weekdays(options.dow)
+        };
+      } else if (options.seconds === null && options.minutes.includes('/') && options.hours.includes('-') && options.date === '*' && options.months === '*') {
+        // */n 1-24 * * 1-7 or  */n 1-24 * * *
+        state.mode = PERIODIC.intervalBetween;
+        state.intervalBetween = {
+          period: parseInt(options.minutes.split('/')[1], 10),
+          unit: PERIODIC_TYPES.minutes,
+          timeFrom: parseInt(options.hours.split('-')[0], 10),
+          timeTo: parseInt(options.hours.split('-')[1], 10),
+          weekdays: SimpleCron.text2weekdays(options.dow)
+        };
+      } else if (options.seconds === null && parseInt(options.minutes, 10).toString() === options.minutes && parseInt(options.hours, 10).toString() === options.hours && options.date === '*' && options.months === '*') {
+        // m h * * 1-7 or m h * * *
+        state.mode = PERIODIC.specific;
+        state.specific = {
+          time: "".concat(padding(parseInt(options.hours, 10)), ":").concat(padding(parseInt(options.minutes, 10))),
+          weekdays: SimpleCron.text2weekdays(options.dow)
+        };
+      } else if (options.seconds === null && parseInt(options.minutes, 10).toString() === options.minutes && parseInt(options.hours, 10).toString() === options.hours && parseInt(options.date, 10).toString() === options.date && parseInt(options.months, 10).toString() === options.months && options.dow === '*') {
+        // m h d M *
+        state.mode = PERIODIC.once;
+        state.once = {
+          time: "".concat(padding(parseInt(options.hours, 10)), ":").concat(padding(parseInt(options.minutes, 10))),
+          date: "".concat(padding(parseInt(options.date, 10)), ".").concat(padding(parseInt(options.months, 10))),
+          // ignored
+          weekdays: SimpleCron.text2weekdays(options.dow)
+        };
+      }
       if (state.mode) {
         return state;
-      } else {
-        return null;
       }
+      return null;
     }
   }, {
     key: "state2cron",
@@ -684,12 +675,24 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
       var cron = '* * * * *';
       if (state.mode === PERIODIC.interval) {
         var settings = state.interval || {};
-        if (settings.period > 60) settings.period = 60;
-        if (settings.period < 1) settings.period = 1;
-        if (settings.minutes > 60) settings.minutes = 60;
-        if (settings.minutes < 1) settings.minutes = 1;
-        if (settings.hours > 24) settings.hours = 24;
-        if (settings.hours < 1) settings.hours = 1;
+        if (settings.period > 60) {
+          settings.period = 60;
+        }
+        if (settings.period < 1) {
+          settings.period = 1;
+        }
+        if (settings.minutes > 60) {
+          settings.minutes = 60;
+        }
+        if (settings.minutes < 1) {
+          settings.minutes = 1;
+        }
+        if (settings.hours > 24) {
+          settings.hours = 24;
+        }
+        if (settings.hours < 1) {
+          settings.hours = 1;
+        }
         if (state.extended) {
           cron = "".concat(settings.minutes > 1 ? "*/".concat(settings.minutes) : '*', " ").concat(settings.hours > 1 ? "*/".concat(settings.hours) : '*', " * * *");
         } else {
@@ -705,45 +708,45 @@ var SimpleCron = /*#__PURE__*/function (_React$Component) {
           }
         }
       } else if (state.mode === PERIODIC.intervalBetween) {
-        var _settings = state.intervalBetween || {};
+        var _settings2 = state.intervalBetween || {};
         var hours;
-        _settings.timeFrom = _settings.timeFrom || 0;
-        _settings.timeTo = _settings.timeTo === undefined ? 24 : _settings.timeTo;
-        if (_settings.timeFrom === 0 && _settings.timeTo === 24) {
+        _settings2.timeFrom = _settings2.timeFrom || 0;
+        _settings2.timeTo = _settings2.timeTo === undefined ? 24 : _settings2.timeTo;
+        if (_settings2.timeFrom === 0 && _settings2.timeTo === 24) {
           hours = '*';
         } else {
-          hours = _settings.timeFrom !== _settings.timeTo ? "".concat(_settings.timeFrom, "-").concat(_settings.timeTo) : '*';
+          hours = _settings2.timeFrom !== _settings2.timeTo ? "".concat(_settings2.timeFrom, "-").concat(_settings2.timeTo) : '*';
         }
-        if (_settings.period > 60) _settings.period = 60;
-        if (_settings.period < 1) _settings.period = 1;
-        _settings.unit = _settings.unit || PERIODIC_TYPES.minutes;
-        switch (_settings.unit) {
+        if (_settings2.period > 60) _settings2.period = 60;
+        if (_settings2.period < 1) _settings2.period = 1;
+        _settings2.unit = _settings2.unit || PERIODIC_TYPES.minutes;
+        switch (_settings2.unit) {
           case PERIODIC_TYPES.seconds:
-            cron = "".concat(_settings.period > 1 ? "*/".concat(_settings.period) : '*', " * ").concat(hours, " * * ").concat(this.periodArray2text(_settings.weekdays));
+            cron = "".concat(_settings2.period > 1 ? "*/".concat(_settings2.period) : '*', " * ").concat(hours, " * * ").concat(this.periodArray2text(_settings2.weekdays));
             break;
           case PERIODIC_TYPES.minutes:
-            cron = "".concat(_settings.period > 1 ? "*/".concat(_settings.period) : '*', " ").concat(hours, " * * ").concat(this.periodArray2text(_settings.weekdays));
+            cron = "".concat(_settings2.period > 1 ? "*/".concat(_settings2.period) : '*', " ").concat(hours, " * * ").concat(this.periodArray2text(_settings2.weekdays));
             break;
           default:
             break;
         }
       } else if (state.mode === PERIODIC.specific) {
-        var _settings2 = state.specific || {};
-        var parts = (_settings2.time || '00:00').split(':');
+        var _settings3 = state.specific || {};
+        var parts = (_settings3.time || '00:00').split(':');
         var minutes = parseInt(parts[1], 10) || 0;
         if (minutes > 59) minutes = 59;
         if (minutes < 0) minutes = 0;
         var _hours = parseInt(parts[0], 10) || 0;
         if (_hours > 23) _hours = 59;
         if (_hours < 0) _hours = 0;
-        cron = "".concat(minutes, " ").concat(_hours, " * * ").concat(this.periodArray2text(_settings2.weekdays || []));
+        cron = "".concat(minutes, " ").concat(_hours, " * * ").concat(this.periodArray2text(_settings3.weekdays || []));
       } else if (state.mode === PERIODIC.once) {
-        var _settings3 = state.once || {};
-        if (!_settings3.date) {
-          _settings3.date = "".concat(new Date().getDate(), ".").concat(padding(new Date().getMonth() + 1));
+        var _settings4 = state.once || {};
+        if (!_settings4.date) {
+          _settings4.date = "".concat(new Date().getDate(), ".").concat(padding(new Date().getMonth() + 1));
         }
-        var _parts2 = (_settings3.time || '00:00').split(':');
-        var partsDate = _settings3.date.split('.');
+        var _parts2 = (_settings4.time || '00:00').split(':');
+        var partsDate = _settings4.date.split('.');
         var _minutes = parseInt(_parts2[1], 10) || 0;
         if (_minutes > 59) _minutes = 59;
         if (_minutes < 0) _minutes = 0;