UI Switch - Handle on/off values that are Objects

FlowFuse · Jan 5, 2024 · d41bf58 · d41bf58
1 parent 34faf64
commit d41bf58
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/nodes/widgets/ui_switch.js b/nodes/widgets/ui_switch.js
@@ -46,13 +46,25 @@ module.exports = function (RED) {
                 // retrieve the assigned on/off value
                 const on = RED.util.evaluateNodeProperty(config.onvalue, config.onvalueType, wNode)
                 const off = RED.util.evaluateNodeProperty(config.offvalue, config.offvalueType, wNode)
-                if (msg.payload === true || msg.payload === on) {
-                    msg.payload = on
-                } else if (msg.payload === false || msg.payload === off) {
-                    msg.payload = off
+
+                if (typeof msg.payload === 'object') {
+                    if (JSON.stringify(msg.payload) === JSON.stringify(on)) {
+                        msg.payload = on
+                    } else if (JSON.stringify(msg.payload) === JSON.stringify(off)) {
+                        msg.payload = off
+                    } else {
+                        // throw Node-RED error
+                        error = 'Invalid payload value'
+                    }
                 } else {
-                    // throw Node-RED error
-                    error = 'Invalid payload value'
+                    if (msg.payload === true || msg.payload === on) {
+                        msg.payload = on
+                    } else if (msg.payload === false || msg.payload === off) {
+                        msg.payload = off
+                    } else {
+                        // throw Node-RED error
+                        error = 'Invalid payload value'
+                    }
                 }
                 if (!error) {
                     // store the latest msg passed to node

diff --git a/ui/src/widgets/ui-switch/UISwitch.vue b/ui/src/widgets/ui-switch/UISwitch.vue
@@ -44,6 +44,13 @@ export default {
                 const val = this.value
                 if (typeof (val) === 'boolean') {
                     return val
+                } else if (typeof (val) === 'object') {
+                    // don't make a decision either way, unless it matches, exactly, the defined on/off values
+                    if (JSON.stringify(val) === JSON.stringify(this.props.evaluated.on)) {
+                        return true
+                    } else if (JSON.stringify(val) === JSON.stringify(this.props.evaluated.off)) {
+                        return false
+                    }
                 } else if (this.props.evaluated) {
                     return val === this.props.evaluated.on
                 }