@iobroker/adapter-react-v5 8.2.13 → 8.3.0

package/build/Components/Schedule.d.ts

@@ -1,5 +1,30 @@
 import { Component, type JSX } from 'react';
 import type { IobTheme } from '../types';
+export interface ScheduleConfigSaved {
+    time?: {
+        exactTime: boolean;
+    } | {
+        start: string;
+        end: string;
+        mode: string;
+        interval: number;
+    };
+    period?: {
+        once: string;
+        days: number;
+        dows: string;
+        dates: string;
+        weeks: number;
+        months: string | number;
+        years: number;
+        yearMonth: number;
+        yearDate: number;
+    };
+    valid?: {
+        from?: string;
+        to?: string;
+    };
+}
 export interface ScheduleConfig {
     time: {
         exactTime: boolean;
@@ -56,7 +81,7 @@ export declare class Schedule extends Component<ScheduleProps, ScheduleState> {
     getPeriodSettingsMonthly(): JSX.Element[] | null;
     getPeriodSettingsYearly(): JSX.Element[] | null;
     static now2string(isEnd?: boolean): string;
-    static string2date(str: string): Date;
+    static string2date(str: string | undefined): Date;
     getValidSettings(): JSX.Element;
     render(): JSX.Element;
 }

package/build/Components/Schedule.js

@@ -185,6 +185,9 @@ const DEFAULT = {
     },
 };
 function string2USdate(date) {
+    if (!date) {
+        return '';
+    }
     const parts = date.split('.');
     if (parts.length === 3) {
         return `${parts[2]}-${parts[1]}-${parts[0]}`;
@@ -250,13 +253,13 @@ export class Schedule extends Component {
                 this.setState({ schedule, desc: Schedule.state2text(schedule) });
             }
             const copy = JSON.parse(JSON.stringify(schedule));
-            if (copy.period.once) {
+            if (copy.period?.once) {
                 const once = copy.period.once;
                 delete copy.period;
                 copy.period = { once };
                 delete copy.valid;
             }
-            else if (copy.period.days) {
+            else if (copy.period?.days) {
                 const days = copy.period.days;
                 const daysOfWeek = copy.period.dows;
                 delete copy.period;
@@ -265,7 +268,7 @@ export class Schedule extends Component {
                     copy.period.dows = daysOfWeek;
                 }
             }
-            else if (copy.period.weeks) {
+            else if (copy.period?.weeks) {
                 const weeks = copy.period.weeks;
                 const daysOfWeek = copy.period.dows;
                 delete copy.period;
@@ -274,7 +277,7 @@ export class Schedule extends Component {
                     copy.period.dows = daysOfWeek;
                 }
             }
-            else if (copy.period.months) {
+            else if (copy.period?.months) {
                 const months = copy.period.months;
                 const dates = copy.period.dates;
                 delete copy.period;
@@ -283,7 +286,7 @@ export class Schedule extends Component {
                     copy.period.dates = dates;
                 }
             }
-            else if (copy.period.years) {
+            else if (copy.period?.years) {
                 const years = copy.period.years;
                 const yearMonth = copy.period.yearMonth;
                 const yearDate = copy.period.yearDate;
@@ -293,23 +296,30 @@ export class Schedule extends Component {
                     copy.period.yearMonth = yearMonth;
                 }
             }
-            if (copy.time.exactTime) {
-                delete copy.time.end;
-                delete copy.time.mode;
-                delete copy.time.interval;
+            if (copy.time?.exactTime) {
+                copy.time = {
+                    exactTime: copy.time?.exactTime,
+                };
             }
             else {
-                delete copy.time.exactTime;
+                const _time = copy.time;
+                copy.time = {
+                    start: _time.start,
+                    end: _time.end,
+                    mode: _time.mode,
+                    interval: _time.interval,
+                };
             }
             if (copy.valid) {
                 if (!copy.valid.to) {
                     delete copy.valid.to;
                 }
-                if (copy.period.days === 1 ||
-                    copy.period.weeks === 1 ||
-                    copy.period.months === 1 ||
-                    copy.period.years === 1) {
-                    const from = Schedule.string2date(copy.valid.from);
+                if (copy.period &&
+                    (copy.period.days === 1 ||
+                        copy.period.weeks === 1 ||
+                        copy.period.months === 1 ||
+                        copy.period.years === 1)) {
+                    const from = Schedule.string2date(copy.valid?.from);
                     const today = new Date();
                     today.setHours(0);
                     today.setMinutes(0);
@@ -336,7 +346,7 @@ export class Schedule extends Component {
             }
         }
         const desc = [];
-        const validFrom = Schedule.string2date(schedule.valid.from);
+        const validFrom = Schedule.string2date(schedule.valid?.from);
         if (schedule.period.once) {
             // once
             const once = Schedule.string2date(schedule.period.once);
@@ -540,17 +550,17 @@ export class Schedule extends Component {
         }
         if (!schedule.period.once) {
             // valid
-            if (validFrom.getTime() > Date.now() && schedule.valid.to) {
+            if (validFrom.getTime() > Date.now() && schedule.valid?.to) {
                 // from XXX to XXXX
-                desc.push(I18n.t('sch_desc_validFromTo', schedule.valid.from, schedule.valid.to));
+                desc.push(I18n.t('sch_desc_validFromTo', schedule.valid?.from, schedule.valid?.to));
             }
             else if (validFrom.getTime() > Date.now()) {
                 // from XXXX
-                desc.push(I18n.t('sch_desc_validFrom', schedule.valid.from));
+                desc.push(I18n.t('sch_desc_validFrom', schedule.valid?.from));
             }
-            else if (schedule.valid.to) {
+            else if (schedule.valid?.to) {
                 // till XXXX
-                desc.push(I18n.t('sch_desc_validTo', schedule.valid.to));
+                desc.push(I18n.t('sch_desc_validTo', schedule.valid?.to));
             }
         }
         return desc.join(' ');
@@ -1199,6 +1209,9 @@ export class Schedule extends Component {
         return `${padding(d.getDate())}.${padding(d.getMonth() + 1)}.${padding(d.getFullYear())}`;
     }
     static string2date(str) {
+        if (!str) {
+            return new Date();
+        }
         let parts = str.split('.'); // 31.12.2019
         if (parts.length === 1) {
             parts = str.split('-'); // 2018-12-31
@@ -1214,7 +1227,7 @@ export class Schedule extends Component {
                 React.createElement("span", { style: { fontWeight: 'bold', paddingRight: 10 } }, I18n.t('sch_valid')),
                 React.createElement("span", null, I18n.t('sch_validFrom'))),
             React.createElement("div", { style: styles.settingsDiv },
-                React.createElement(TextField, { variant: "standard", style: { ...styles.inputDate, marginRight: 10 }, key: "exactTimeFrom", inputRef: this.refFrom, defaultValue: string2USdate(schedule.valid.from), type: "date", 
+                React.createElement(TextField, { variant: "standard", style: { ...styles.inputDate, marginRight: 10 }, key: "exactTimeFrom", inputRef: this.refFrom, defaultValue: string2USdate(schedule.valid?.from), type: "date", 
                     // inputComponent={TextDate}
                     onChange: e => {
                         if (this.timerFrom) {
@@ -1238,12 +1251,12 @@ export class Schedule extends Component {
                     }, slotProps: {
                         inputLabel: { shrink: true },
                     }, margin: "normal" }),
-                React.createElement(FormControlLabel, { control: React.createElement(Checkbox, { style: styles.inputRadio, checked: !!schedule.valid.to, onClick: () => {
+                React.createElement(FormControlLabel, { control: React.createElement(Checkbox, { style: styles.inputRadio, checked: !!schedule.valid?.to, onClick: () => {
                             const _schedule = JSON.parse(JSON.stringify(this.state.schedule));
                             _schedule.valid.to = _schedule.valid.to ? '' : Schedule.now2string(true);
                             this.onChange(_schedule);
                         } }), label: I18n.t('sch_validTo') }),
-                !!schedule.valid.to && (React.createElement(TextField, { variant: "standard", inputRef: this.refTo, style: { ...styles.inputDate, marginRight: 10 }, key: "exactTimeFrom", type: "date", defaultValue: string2USdate(schedule.valid.to), 
+                !!schedule.valid?.to && (React.createElement(TextField, { variant: "standard", inputRef: this.refTo, style: { ...styles.inputDate, marginRight: 10 }, key: "exactTimeFrom", type: "date", defaultValue: string2USdate(schedule.valid.to), 
                     // inputComponent={TextDate}
                     onChange: e => {
                         if (this.timerTo) {