Merge branch 'master' into pr/612

HaveAGitGat · May 7, 2024 · 9b34065 · 9b34065
2 parents bb78f24 + c19dd11
commit 9b34065
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/FlowPlugins/CommunityFlowPlugins/tools/checkFlowVariable/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/tools/checkFlowVariable/1.0.0/index.js
@@ -47,7 +47,7 @@ var details = function () { return ({
             inputUI: {
                 type: 'text',
             },
-            tooltip: 'Value of variable to check',
+            tooltip: "Value of variable to check. \nYou can specify multiple values separated by comma. For example: value1,value2,value3",
         },
     ],
     outputs: [
@@ -99,23 +99,24 @@ var plugin = function (args) {
     }
     targetValue = String(targetValue);
     var outputNumber = 1;
+    var valuesArr = value.trim().split(',');
     if (condition === '==') {
-        if (targetValue === value) {
-            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " matches condition ").concat(condition, " ").concat(value));
+        if (valuesArr.includes(targetValue)) {
+            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " matches condition ").concat(condition, " ").concat(valuesArr));
             outputNumber = 1;
         }
         else {
-            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " does not match condition ").concat(condition, " ").concat(value));
+            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " does not match condition ").concat(condition, " ").concat(valuesArr));
             outputNumber = 2;
         }
     }
     else if (condition === '!=') {
-        if (targetValue !== value) {
-            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " matches condition ").concat(condition, " ").concat(value));
+        if (!valuesArr.includes(targetValue)) {
+            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " matches condition ").concat(condition, " ").concat(valuesArr));
             outputNumber = 1;
         }
         else {
-            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " does not match condition ").concat(condition, " ").concat(value));
+            args.jobLog("Variable ".concat(variable, " of value ").concat(targetValue, " does not match condition ").concat(condition, " ").concat(valuesArr));
             outputNumber = 2;
         }
     }

diff --git a/FlowPluginsTs/CommunityFlowPlugins/tools/checkFlowVariable/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/tools/checkFlowVariable/1.0.0/index.ts
@@ -64,7 +64,8 @@ const details = (): IpluginDetails => ({
       inputUI: {
         type: 'text',
       },
-      tooltip: 'Value of variable to check',
+      tooltip: `Value of variable to check. 
+You can specify multiple values separated by comma. For example: value1,value2,value3`,
     },
   ],
   outputs: [
@@ -122,20 +123,21 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
   targetValue = String(targetValue);
   let outputNumber = 1;
 
+  const valuesArr = value.trim().split(',');
   if (condition === '==') {
-    if (targetValue === value) {
-      args.jobLog(`Variable ${variable} of value ${targetValue} matches condition ${condition} ${value}`);
+    if (valuesArr.includes(targetValue)) {
+      args.jobLog(`Variable ${variable} of value ${targetValue} matches condition ${condition} ${valuesArr}`);
       outputNumber = 1;
     } else {
-      args.jobLog(`Variable ${variable} of value ${targetValue} does not match condition ${condition} ${value}`);
+      args.jobLog(`Variable ${variable} of value ${targetValue} does not match condition ${condition} ${valuesArr}`);
       outputNumber = 2;
     }
   } else if (condition === '!=') {
-    if (targetValue !== value) {
-      args.jobLog(`Variable ${variable} of value ${targetValue} matches condition ${condition} ${value}`);
+    if (!valuesArr.includes(targetValue)) {
+      args.jobLog(`Variable ${variable} of value ${targetValue} matches condition ${condition} ${valuesArr}`);
       outputNumber = 1;
     } else {
-      args.jobLog(`Variable ${variable} of value ${targetValue} does not match condition ${condition} ${value}`);
+      args.jobLog(`Variable ${variable} of value ${targetValue} does not match condition ${condition} ${valuesArr}`);
       outputNumber = 2;
     }
   }