feat(event-state): Add predefined ignore event types

zachowj · Oct 5, 2020 · d70ba6f · d70ba6f
1 parent 4503856
commit d70ba6f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 4 deletions.
diff --git a/nodes/events-state-changed/events-state-changed.js b/nodes/events-state-changed/events-state-changed.js
@@ -20,9 +20,14 @@ module.exports = function (RED) {
             outputinitially: {},
             state_type: (nodeDef) => nodeDef.state_type || 'str',
             output_only_on_state_change: {},
-            for: { value: '0' },
-            forType: { value: 'num' },
-            forUnits: { value: 'minutes' },
+            for: (nodeDef) => nodeDef.for || '0',
+            forType: (nodeDef) => nodeDef.forType || 'num',
+            forUnits: (nodeDef) => nodeDef.forUnits || 'minutes',
+            ignorePrevStateNull: {},
+            ignorePrevStateUnknown: {},
+            ignorePrevStateUnavailable: {},
+            ignoreCurrentStateUnknown: {},
+            ignoreCurrentStateUnavailable: {},
         },
     };
 
@@ -59,7 +64,6 @@ module.exports = function (RED) {
             if (
                 this.isEnabled === false ||
                 !this.isHomeAssistantRunning ||
-                !evt.event.new_state ||
                 !shouldIncludeEvent(
                     evt.entity_id,
                     this.nodeConfig.entityidfilter,
@@ -73,6 +77,20 @@ module.exports = function (RED) {
             const oldState = selectn('event.old_state', eventMessage);
             const newState = selectn('event.new_state', eventMessage);
 
+            if (
+                (config.ignorePrevStateNull && !oldState) ||
+                (config.ignorePrevStateUnknown &&
+                    oldState.state === 'unknown') ||
+                (config.ignorePrevStateUnavailable &&
+                    oldState.state === 'unavailable') ||
+                (config.ignoreCurrentStateUnknown &&
+                    newState.state === 'unknown') ||
+                (config.ignoreCurrentStateUnavailable &&
+                    newState.state === 'unavailable')
+            ) {
+                return;
+            }
+
             // Convert and save original state if needed
             this.castState(oldState, config.state_type);
             this.castState(newState, config.state_type);

diff --git a/nodes/events-state-changed/ui-events-state-changed.html b/nodes/events-state-changed/ui-events-state-changed.html
@@ -82,3 +82,32 @@
     <input type="checkbox" id="node-input-outputinitially" />
     <label for="node-input-outputinitially"> Output on Connect </label>
 </div>
+
+<div class="form-row checkbox-option">
+    <label><i class="fa fa-ban"></i> Ignore state change event when:</label>
+    <br />
+    <input type="checkbox" id="node-input-ignorePrevStateNull" />
+    <label for="node-input-ignorePrevStateNull">
+        Previous state doesn't exist
+    </label>
+    <br />
+    <input type="checkbox" id="node-input-ignorePrevStateUnknown" />
+    <label for="node-input-ignorePrevStateUnknown">
+        Previous state is <code>unknown</code>
+    </label>
+    <br />
+    <input type="checkbox" id="node-input-ignorePrevStateUnavailable" />
+    <label for="node-input-ignorePrevStateUnavailable">
+        Previous state is <code>unavailable</code>
+    </label>
+    <br />
+    <input type="checkbox" id="node-input-ignoreCurrentStateUnknown" />
+    <label for="node-input-ignoreCurrentStateUnknown">
+        Current state is <code>unknown</code>
+    </label>
+    <br />
+    <input type="checkbox" id="node-input-ignoreCurrentStateUnavailable" />
+    <label for="node-input-ignoreCurrentStateUnavailable">
+        Current state is <code>unavailable</code>
+    </label>
+</div>
diff --git a/nodes/events-state-changed/ui-events-state-changed.js b/nodes/events-state-changed/ui-events-state-changed.js
@@ -36,6 +36,11 @@ RED.nodes.registerType('server-state-changed', {
         for: { value: 0 },
         forType: { value: 'num' },
         forUnits: { value: 'minutes' },
+        ignorePrevStateNull: { value: false },
+        ignorePrevStateUnknown: { value: false },
+        ignorePrevStateUnavailable: { value: false },
+        ignoreCurrentStateUnknown: { value: false },
+        ignoreCurrentStateUnavailable: { value: false },
     },
     oneditprepare: function () {
         const $entityidfilter = $('#node-input-entityidfilter');