From 2b343a4aa56fcae686fe5ed32e9fe4fbf1c0a1a8 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Mon, 23 Dec 2019 13:22:15 -0600 Subject: [PATCH] :zap: Add smallerEqual and largerEqual to IF and Switch Nodes --- packages/nodes-base/nodes/If.node.ts | 10 ++++++++++ packages/nodes-base/nodes/Switch.node.ts | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/packages/nodes-base/nodes/If.node.ts b/packages/nodes-base/nodes/If.node.ts index 34241a37ac..9b649050bc 100644 --- a/packages/nodes-base/nodes/If.node.ts +++ b/packages/nodes-base/nodes/If.node.ts @@ -92,6 +92,10 @@ export class If implements INodeType { name: 'Smaller', value: 'smaller' }, + { + name: 'Smaller Equal', + value: 'smallerEqual' + }, { name: 'Equal', value: 'equal' @@ -104,6 +108,10 @@ export class If implements INodeType { name: 'Larger', value: 'larger' }, + { + name: 'Larger Equal', + value: 'largerEqual' + }, ], default: 'smaller', description: 'Operation to decide where the the data should be mapped to.', @@ -231,7 +239,9 @@ export class If implements INodeType { equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2, notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2, larger: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 > value2, + largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 >= value2, smaller: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 < value2, + smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 <= value2, regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { const regexMatch = value2.toString().match(new RegExp('^/(.*?)/([gimy]*)$')); diff --git a/packages/nodes-base/nodes/Switch.node.ts b/packages/nodes-base/nodes/Switch.node.ts index 0c71e88c86..3702a7c598 100644 --- a/packages/nodes-base/nodes/Switch.node.ts +++ b/packages/nodes-base/nodes/Switch.node.ts @@ -239,6 +239,10 @@ export class Switch implements INodeType { name: 'Smaller', value: 'smaller' }, + { + name: 'Smaller Equal', + value: 'smallerEqual' + }, { name: 'Equal', value: 'equal' @@ -251,6 +255,10 @@ export class Switch implements INodeType { name: 'Larger', value: 'larger' }, + { + name: 'Larger Equal', + value: 'largerEqual' + }, ], default: 'smaller', description: 'Operation to decide where the the data should be mapped to.', @@ -465,7 +473,9 @@ export class Switch implements INodeType { equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2, notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2, larger: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 > value2, + largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 >= value2, smaller: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 < value2, + smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 <= value2, regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { const regexMatch = value2.toString().match(new RegExp('^/(.*?)/([gimy]*)$'));