Merge pull request OneUptime#1648 from OneUptime/add-more-conds

refactor: Add support for additional condition operators in IfElse co…

Author: simlarsen

Common/Server/Types/Workflow/Components/Conditions/IfElse.ts

@@ -5,7 +5,9 @@ import ReturnResult from "Common/Types/IsolatedVM/ReturnResult";
 import { JSONObject, JSONValue } from "Common/Types/JSON";
 import ComponentMetadata, { Port } from "Common/Types/Workflow/Component";
 import ComponentID from "Common/Types/Workflow/ComponentID";
-import Components from "Common/Types/Workflow/Components/Condition";
+import Components, {
+  ConditionOperator,
+} from "Common/Types/Workflow/Components/Condition";
 
 export default class IfElse extends ComponentCode {
   public constructor() {
@@ -87,7 +89,7 @@ export default class IfElse extends ComponentCode {
         return arg;
       };
 
-      const code: string = `
+      let code: string = `
                     const input1 = ${
                       serialize(args["input-1"] as string) || ""
                     };
@@ -96,9 +98,19 @@ export default class IfElse extends ComponentCode {
                       serialize(args["input-2"] as string) || ""
                     };
                     
-                    return input1 ${
-                      (args["operator"] as string) || "=="
-                    } input2`;
+                    `;
+
+      if (args["operator"] === ConditionOperator.Contains) {
+        code += `return input1.includes(input2);`;
+      } else if (args["operator"] === ConditionOperator.DoesNotContain) {
+        code += `return !input1.includes(input2);`;
+      } else if (args["operator"] === ConditionOperator.StartsWith) {
+        code += `return input1.startsWith(input2);`;
+      } else if (args["operator"] === ConditionOperator.EndsWith) {
+        code += `return input1.endsWith(input2);`;
+      } else {
+        code += `return input1 ${(args["operator"] as string) || "=="} input2;`;
+      }
 
       const returnResult: ReturnResult = await VMUtil.runCodeInSandbox({
         code,

Common/Types/Workflow/Components/Condition.ts

@@ -5,6 +5,19 @@ import ComponentMetadata, {
   ComponentType,
 } from "./../Component";
 
+export enum ConditionOperator {
+  EqualTo = "==",
+  NotEqualTo = "!=",
+  GreaterThan = ">",
+  GreaterThanOrEqualTo = ">=",
+  LessThan = "<",
+  LessThanOrEqualTo = "<=",
+  Contains = "contains",
+  DoesNotContain = "does not contain",
+  StartsWith = "starts with",
+  EndsWith = "ends with",
+}
+
 const components: Array<ComponentMetadata> = [
   {
     id: ComponentID.IfElse,

Common/UI/Components/Workflow/Utils.ts

@@ -9,6 +9,7 @@ import ComponentMetadata, {
 import Components, { Categories } from "Common/Types/Workflow/Components";
 import BaseModelComponentFactory from "Common/Types/Workflow/Components/BaseModel";
 import Entities from "Common/Models/DatabaseModels/Index";
+import { ConditionOperator } from "../../../Types/Workflow/Components/Condition";
 
 type LoadComponentsAndCategoriesFunction = () => {
   components: Array<ComponentMetadata>;
@@ -192,27 +193,43 @@ export const componentInputTypeToFormFieldType: ComponentInputTypeToFormFieldTyp
         dropdownOptions: [
           {
             label: "Equal To",
-            value: "==",
+            value: ConditionOperator.EqualTo,
           },
           {
             label: "Not Equal To",
-            value: "!=",
+            value: ConditionOperator.NotEqualTo,
           },
           {
             label: "Greater Than",
-            value: ">",
+            value: ConditionOperator.GreaterThan,
           },
           {
             label: "Less Than",
-            value: "<",
+            value: ConditionOperator.LessThan,
           },
           {
             label: "Greater Than or Equal",
-            value: ">=",
+            value: ConditionOperator.GreaterThanOrEqualTo,
           },
           {
             label: "Less Than or Equal",
-            value: "<=",
+            value: ConditionOperator.LessThanOrEqualTo,
+          },
+          {
+            label: "Contains",
+            value: ConditionOperator.Contains,
+          },
+          {
+            label: "Does Not Contain",
+            value: ConditionOperator.DoesNotContain,
+          },
+          {
+            label: "Starts With",
+            value: ConditionOperator.StartsWith,
+          },
+          {
+            label: "Ends With",
+            value: ConditionOperator.EndsWith,
           },
         ],
       };