Rules are working

ioBroker · Nov 24, 2024 · 0444f90 · 0444f90
1 parent 3c7f89d
commit 0444f90
Show file tree

Hide file tree

Showing 35 changed files with 4,427 additions and 4,330 deletions.
diff --git a/build-backend/main.js b/build-backend/main.js
diff --git a/build-backend/main.js.map b/build-backend/main.js.map
diff --git a/src-editor/src/App.tsx b/src-editor/src/App.tsx
@@ -749,7 +749,7 @@ class App extends GenericApp<AppProps, AppState> {
 
     onEnableDisable(id: string, enabled: boolean): void {
         if (this.scripts[id] && this.scripts[id].type === 'script') {
-            const common = this.scripts[id].common;
+            const common: ioBroker.ScriptCommon = this.scripts[id].common as ioBroker.ScriptCommon;
             common.enabled = enabled;
             common.expert = true;
             this.updateScript(id, id, common).catch(err => err !== 'canceled' && this.showJsError(err));

diff --git a/src-editor/src/Components/BlocklyEditor.tsx b/src-editor/src/Components/BlocklyEditor.tsx
@@ -439,10 +439,10 @@ class BlocklyEditor extends React.Component<BlocklyEditorProps, BlocklyEditorSta
         const selectedBlocks: BlocklyTS.BlockSvg | null = BlocklyTS.getSelected() as BlocklyTS.BlockSvg | null;
         if (selectedBlocks) {
             const xmlBlock: Element = BlocklyTS.Xml.blockToDom(selectedBlocks) as Element;
-            // @ts-expect-error fix later
-            if (BlocklyTS.dragMode_ !== BlocklyTS.DRAG_FREE) {
-                BlocklyTS.Xml.deleteNext(xmlBlock);
-            }
+            // @1ts-expect-error fix later. TODO!!!!
+            // if (BlocklyTS.dragMode_ !== BlocklyTS.DRAG_FREE) {
+            //    BlocklyTS.Xml.deleteNext(xmlBlock);
+            // }
             // Encode start position in XML.
             const xy = selectedBlocks.getRelativeToSurfaceXY();
             xmlBlock.setAttribute('x', (selectedBlocks.RTL ? -xy.x : xy.x).toString());

diff --git a/src-editor/src/Components/RulesEditor/components/Blocks/ActionOperateStates.tsx b/src-editor/src/Components/RulesEditor/components/Blocks/ActionOperateStates.tsx
@@ -18,7 +18,7 @@ class ActionOperateStates extends GenericBlock<RuleBlockConfigActionOperationSta
 
     isAllTriggersOnState(): boolean {
         return (
-            this.props.userRules?.triggers?.find(item => item.id === 'TriggerState') &&
+            !!this.props.userRules?.triggers?.find(item => item.id === 'TriggerState') &&
             !this.props.userRules?.triggers?.find(item => item.id !== 'TriggerState')
         );
     }
@@ -38,7 +38,9 @@ class ActionOperateStates extends GenericBlock<RuleBlockConfigActionOperationSta
         return (
             <span>
                 {I18n.t('Set:')}{' '}
-                <span className={debugMessage.data.ack ? this.props.classes.valueAck : this.props.classes.valueNotAck}>
+                <span
+                    className={debugMessage.data.ack ? this.props.classes?.valueAck : this.props.classes?.valueNotAck}
+                >
                     {renderValue(debugMessage.data.val)}
                 </span>
             </span>

diff --git a/src-editor/src/Components/RulesEditor/components/Blocks/ActionSetState.tsx b/src-editor/src/Components/RulesEditor/components/Blocks/ActionSetState.tsx
@@ -27,7 +27,7 @@ class ActionSetState extends GenericBlock<RuleBlockConfigActionSetState> {
 
     isAllTriggersOnState(): boolean {
         return (
-            this.props.userRules?.triggers?.find(item => item.id === 'TriggerState') &&
+            !!this.props.userRules?.triggers?.find(item => item.id === 'TriggerState') &&
             !this.props.userRules?.triggers?.find(item => item.id !== 'TriggerState')
         );
     }

diff --git a/src-editor/src/Components/RulesEditor/components/Blocks/ActionSetStateDelayed.tsx b/src-editor/src/Components/RulesEditor/components/Blocks/ActionSetStateDelayed.tsx
@@ -20,7 +20,7 @@ class ActionSetStateDelayed extends GenericBlock<RuleBlockConfigActionSetStateDe
 
     isAllTriggersOnState(): boolean {
         return (
-            this.props.userRules?.triggers?.find(item => item.id === 'TriggerState') &&
+            !!this.props.userRules?.triggers?.find(item => item.id === 'TriggerState') &&
             !this.props.userRules?.triggers?.find(item => item.id !== 'TriggerState')
         );
     }
@@ -60,7 +60,9 @@ class ActionSetStateDelayed extends GenericBlock<RuleBlockConfigActionSetStateDe
         return (
             <span>
                 {I18n.t('Set:')}{' '}
-                <span className={debugMessage.data.ack ? this.props.classes.valueAck : this.props.classes.valueNotAck}>
+                <span
+                    className={debugMessage.data.ack ? this.props.classes?.valueAck : this.props.classes?.valueNotAck}
+                >
                     {renderValue(debugMessage.data.val)}
                 </span>
             </span>

diff --git a/src-editor/src/Components/RulesEditor/components/Blocks/ConditionState.tsx b/src-editor/src/Components/RulesEditor/components/Blocks/ConditionState.tsx
@@ -9,6 +9,7 @@ import { GenericBlock, type GenericBlockProps, type GenericBlockState } from '..
 import HysteresisImage from '../../../assets/hysteresis.png';
 import type {
     RuleBlockConfigActionActionState,
+    RuleBlockConfigTriggerState,
     RuleBlockDescription,
     RuleContext,
     RuleInputAny,
@@ -97,7 +98,7 @@ class ConditionState extends GenericBlock<RuleBlockConfigActionActionState, Cond
             const compare = config.tagCard === '=' ? '==' : config.tagCard === '<>' ? '!=' : config.tagCard;
             if (config.useTrigger) {
                 debugValue = 'obj.state.val';
-                if (context?.trigger?.oidType === 'string') {
+                if ((context?.trigger as RuleBlockConfigTriggerState)?.oidType === 'string') {
                     value = (value as string).replace(/"/g, '\\"');
                     result = `subCondVar${config._id} ${compare} "${value}"`;
                 } else {
@@ -127,7 +128,7 @@ class ConditionState extends GenericBlock<RuleBlockConfigActionActionState, Cond
         } else {
             if (config.useTrigger) {
                 debugValue = 'obj.state.val';
-                if (context?.trigger?.oidType === 'string') {
+                if ((context?.trigger as RuleBlockConfigTriggerState)?.oidType === 'string') {
                     value = (value as string).replace(/"/g, '\\"');
                     result = `obj.state.val.includes("${value}")`;
                 } else {
@@ -183,9 +184,9 @@ class ConditionState extends GenericBlock<RuleBlockConfigActionActionState, Cond
         }
 
         if (isAllTriggersOnState && useTrigger && this.props.userRules?.triggers?.length === 1) {
-            oidType = this.props.userRules.triggers[0].oidType;
-            oidUnit = this.props.userRules.triggers[0].oidUnit;
-            oidStates = this.props.userRules.triggers[0].oidStates;
+            oidType = (this.props.userRules.triggers[0] as RuleBlockConfigTriggerState).oidType;
+            oidUnit = (this.props.userRules.triggers[0] as RuleBlockConfigTriggerState).oidUnit;
+            oidStates = (this.props.userRules.triggers[0] as RuleBlockConfigTriggerState).oidStates;
         }
 
         const _tagCardArray: RuleTagCard[] = ConditionState.getStaticData().tagCardArray as RuleTagCard[];
@@ -233,7 +234,14 @@ class ConditionState extends GenericBlock<RuleBlockConfigActionActionState, Cond
             ];
 
             if (oidStates) {
-                options = Object.keys(oidStates).map(val => ({ value: val, title: oidStates[val] }));
+                options = Object.keys(oidStates)
+                    .map(val => {
+                        if (oidStates) {
+                            return { value: val, title: oidStates[val] };
+                        }
+                        return null;
+                    })
+                    .filter(i => i) as { value: string | boolean; title: string }[];
             }
         } else if (oidType === 'boolean') {
             tagCardArray = [
@@ -291,7 +299,10 @@ class ConditionState extends GenericBlock<RuleBlockConfigActionActionState, Cond
                 },
             ];
             if (oidStates) {
-                options = Object.keys(oidStates).map(val => ({ value: val, title: oidStates[val] }));
+                options = Object.keys(oidStates).map(val => ({
+                    value: val,
+                    title: oidStates ? oidStates[val] : val.toString(),
+                }));
             }
         }
 

diff --git a/src-editor/src/Components/RulesEditor/components/Blocks/TriggerSchedule.tsx b/src-editor/src/Components/RulesEditor/components/Blocks/TriggerSchedule.tsx
@@ -6,7 +6,7 @@ import { ComplexCron, Schedule, I18n } from '@iobroker/adapter-react-v5';
 import convertCronToText from '@iobroker/adapter-react-v5/build/Components/SimpleCron/cronText';
 
 import { GenericBlock, type GenericBlockProps, type GenericBlockState } from '../GenericBlock';
-import Compile from '../../helpers/Compile';
+import { STANDARD_FUNCTION_STATE, STANDARD_FUNCTION_STATE_ONCHANGE } from '../../helpers/Compile';
 import CustomInput from '../CustomInput';
 import CustomButton from '../CustomButton';
 import CustomModal from '../CustomModal';
@@ -63,7 +63,7 @@ class TriggerScheduleBlock extends GenericBlock<RuleBlockConfigTriggerSchedule,
 
     static compile(config: RuleBlockConfigTriggerSchedule, context: RuleContext): string {
         let text = '';
-        let func = context.justCheck ? Compile.STANDARD_FUNCTION_STATE : Compile.STANDARD_FUNCTION_STATE_ONCHANGE;
+        let func = context.justCheck ? STANDARD_FUNCTION_STATE : STANDARD_FUNCTION_STATE_ONCHANGE;
         func = func.replace('"__%%DEBUG_TRIGGER%%__"', `_sendToFrontEnd(${config._id}, {trigger: true})`);
 
         if (config.tagCard === 'interval') {
@@ -214,7 +214,7 @@ class TriggerScheduleBlock extends GenericBlock<RuleBlockConfigTriggerSchedule,
                 },
                 {
                     nameRender: 'renderNameText',
-                    attr: 'textTime',
+                    attr: 'textTime1',
                     defaultValue: time,
                 },
             ];
@@ -317,24 +317,25 @@ class TriggerScheduleBlock extends GenericBlock<RuleBlockConfigTriggerSchedule,
                         onClick={() => this.setState({ openDialog: true })}
                     />
                 </div>
-                <CustomModal
-                    open={!!this.state.openDialog}
-                    onApply={(): void => {
-                        onChange(textCron, attr, () => {
-                            onChange(convertCronToText(textCron, I18n.getLanguage()), 'addText');
-                            this.setState({ openDialog: false });
-                        });
-                    }}
-                    onClose={() => this.setState({ openDialog: false })}
-                >
-                    <ComplexCron
-                        cronExpression={
-                            (settings as Record<string, any>)[attr] ? (settings as Record<string, any>)[attr] : ''
-                        }
-                        onChange={el => (textCron = el)}
-                        language={I18n.getLanguage()}
-                    />
-                </CustomModal>
+                {this.state.openDialog ? (
+                    <CustomModal
+                        onApply={(): void => {
+                            onChange(textCron, attr, () => {
+                                onChange(convertCronToText(textCron, I18n.getLanguage()), 'addText');
+                                this.setState({ openDialog: false });
+                            });
+                        }}
+                        onClose={() => this.setState({ openDialog: false })}
+                    >
+                        <ComplexCron
+                            cronExpression={
+                                (settings as Record<string, any>)[attr] ? (settings as Record<string, any>)[attr] : ''
+                            }
+                            onChange={el => (textCron = el)}
+                            language={I18n.getLanguage()}
+                        />
+                    </CustomModal>
+                ) : null}
                 {this.renderNameText(
                     {
                         nameRender: 'renderNameText',
@@ -383,30 +384,31 @@ class TriggerScheduleBlock extends GenericBlock<RuleBlockConfigTriggerSchedule,
                         onClick={() => this.setState({ openDialog: true })}
                     />
                 </div>
-                <CustomModal
-                    open={!!this.state.openDialog}
-                    onApply={() =>
-                        this.setState({ openDialog: false }, () =>
-                            onChange({
-                                [`${attr}Text`]: wizardText,
-                                [attr]: wizard,
-                            }),
-                        )
-                    }
-                    onClose={() => this.setState({ openDialog: false })}
-                >
-                    <Schedule
-                        theme={this.props.theme}
-                        schedule={value}
-                        onChange={(schedule, description) => {
-                            wizardText = description || '';
-                            const wizardObj: ScheduleConfig = JSON.parse(schedule) as ScheduleConfig;
-                            wizardObj.valid = wizardObj.valid || {};
-                            wizardObj.valid.from = wizardObj.valid.from || Schedule.now2string();
-                            wizard = JSON.stringify(wizardObj);
-                        }}
-                    />
-                </CustomModal>
+                {this.state.openDialog ? (
+                    <CustomModal
+                        onApply={() =>
+                            this.setState({ openDialog: false }, () =>
+                                onChange({
+                                    [`${attr}Text`]: wizardText,
+                                    [attr]: wizard,
+                                }),
+                            )
+                        }
+                        onClose={() => this.setState({ openDialog: false })}
+                    >
+                        <Schedule
+                            theme={this.props.theme}
+                            schedule={value}
+                            onChange={(schedule, description) => {
+                                wizardText = description || '';
+                                const wizardObj: ScheduleConfig = JSON.parse(schedule) as ScheduleConfig;
+                                wizardObj.valid = wizardObj.valid || {};
+                                wizardObj.valid.from = wizardObj.valid.from || Schedule.now2string();
+                                wizard = JSON.stringify(wizardObj);
+                            }}
+                        />
+                    </CustomModal>
+                ) : null}
             </div>
         );
     }

diff --git a/src-editor/src/Components/RulesEditor/components/Blocks/TriggerScriptSave.tsx b/src-editor/src/Components/RulesEditor/components/Blocks/TriggerScriptSave.tsx
@@ -1,6 +1,6 @@
 import { I18n } from '@iobroker/adapter-react-v5';
 import { GenericBlock, type GenericBlockProps } from '../GenericBlock';
-import Compile from '../../helpers/Compile';
+import { NO_FUNCTION } from '../../helpers/Compile';
 import type {
     RuleBlockConfigTriggerScriptSave,
     RuleBlockDescription,
@@ -14,10 +14,7 @@ class TriggerScriptSave extends GenericBlock<RuleBlockConfigTriggerScriptSave> {
     }
 
     static compile(config: RuleBlockConfigTriggerScriptSave, _context: RuleContext): string {
-        return Compile.NO_FUNCTION.replace(
-            '"__%%DEBUG_TRIGGER%%__"',
-            `_sendToFrontEnd(${config._id}, {trigger: true})`,
-        );
+        return NO_FUNCTION.replace('"__%%DEBUG_TRIGGER%%__"', `_sendToFrontEnd(${config._id}, {trigger: true})`);
     }
 
     // eslint-disable-next-line class-methods-use-this