1674 - Update Condition definition, add OBJECT_BUILDER as ControlType in task dispatchers

Author: ivicac

server/libs/modules/task-dispatchers/condition/src/main/java/com/bytechef/task/dispatcher/condition/ConditionTaskDispatcherDefinitionFactory.java

@@ -61,22 +61,23 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                 .description("Set condition as raw expression or list of conditions.")
                 .defaultValue(false),
             array(CONDITIONS)
-                .label("Conditions")
-                .placeholder("Or Condition")
+                .label("OR Conditions")
+                .placeholder("Add OR Condition")
                 .description("The type of values to compare.")
                 .expressionEnabled(false)
                 .displayCondition("%s == false".formatted(RAW_EXPRESSION))
                 .items(
                     array()
-                        .label("And conditions")
+                        .label("AND condition")
+                        .placeholder("Add AND Condition")
                         .expressionEnabled(false)
                         .items(
                             object()
                                 .label("Boolean Expression")
                                 .expressionEnabled(false)
                                 .properties(
                                     object(BOOLEAN)
-                                        .label("Boolean Expression")
+                                        .label("Boolean")
                                         .expressionEnabled(false)
                                         .properties(
                                             bool(VALUE_1)
@@ -102,7 +103,7 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                                 .expressionEnabled(false)
                                 .properties(
                                     object(DATE_TIME)
-                                        .label("Date & Time Expression")
+                                        .label("Date & Time")
                                         .expressionEnabled(false)
                                         .properties(
                                             dateTime(VALUE_1)
@@ -128,7 +129,7 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                                 .expressionEnabled(false)
                                 .properties(
                                     object(NUMBER)
-                                        .label("Number Expression")
+                                        .label("Number")
                                         .expressionEnabled(false)
                                         .properties(
                                             number(VALUE_1)
@@ -165,7 +166,7 @@ public class ConditionTaskDispatcherDefinitionFactory implements TaskDispatcherD
                                 .expressionEnabled(false)
                                 .properties(
                                     object(STRING)
-                                        .label("String Expression")
+                                        .label("String")
                                         .expressionEnabled(false)
                                         .properties(
                                             string(VALUE_1)

server/libs/modules/task-dispatchers/condition/src/test/resources/definition/condition_v1.json

@@ -85,7 +85,7 @@
           "defaultValue" : null,
           "description" : null,
           "exampleValue" : null,
-          "label" : "Boolean Expression",
+          "label" : "Boolean",
           "placeholder" : null,
           "options" : null,
           "additionalProperties" : null,
@@ -165,9 +165,9 @@
             } ],
             "controlType" : "SELECT"
           } ],
-          "controlType" : "SELECT"
+          "controlType" : "OBJECT_BUILDER"
         } ],
-        "controlType" : "SELECT"
+        "controlType" : "OBJECT_BUILDER"
       }, {
         "advancedOption" : null,
         "displayCondition" : null,
@@ -197,7 +197,7 @@
           "defaultValue" : null,
           "description" : null,
           "exampleValue" : null,
-          "label" : "Date & Time Expression",
+          "label" : "Date & Time",
           "placeholder" : null,
           "options" : null,
           "additionalProperties" : null,
@@ -261,9 +261,9 @@
             "options" : null,
             "controlType" : "DATE_TIME"
           } ],
-          "controlType" : "SELECT"
+          "controlType" : "OBJECT_BUILDER"
         } ],
-        "controlType" : "SELECT"
+        "controlType" : "OBJECT_BUILDER"
       }, {
         "advancedOption" : null,
         "displayCondition" : null,
@@ -293,7 +293,7 @@
           "defaultValue" : null,
           "description" : null,
           "exampleValue" : null,
-          "label" : "Number Expression",
+          "label" : "Number",
           "placeholder" : null,
           "options" : null,
           "additionalProperties" : null,
@@ -387,9 +387,9 @@
             "numberPrecision" : null,
             "controlType" : "NUMBER"
           } ],
-          "controlType" : "SELECT"
+          "controlType" : "OBJECT_BUILDER"
         } ],
-        "controlType" : "SELECT"
+        "controlType" : "OBJECT_BUILDER"
       }, {
         "advancedOption" : null,
         "displayCondition" : null,
@@ -419,7 +419,7 @@
           "defaultValue" : null,
           "description" : null,
           "exampleValue" : null,
-          "label" : "String Expression",
+          "label" : "String",
           "placeholder" : null,
           "options" : null,
           "additionalProperties" : null,
@@ -529,9 +529,9 @@
             "maxLength" : null,
             "minLength" : null
           } ],
-          "controlType" : "SELECT"
+          "controlType" : "OBJECT_BUILDER"
         } ],
-        "controlType" : "SELECT"
+        "controlType" : "OBJECT_BUILDER"
       } ],
       "maxItems" : null,
       "minItems" : null,

server/libs/platform/platform-configuration/platform-configuration-rest/platform-configuration-rest-api/src/main/java/com/bytechef/platform/configuration/web/rest/mapper/PropertyMapper.java

@@ -171,8 +171,9 @@ public interface TaskDispatcherPropertyMapper
         com.bytechef.platform.workflow.task.dispatcher.registry.domain.Property.PropertyVisitor {
 
         @Override
-        default PropertyModel
-            convert(com.bytechef.platform.workflow.task.dispatcher.registry.domain.Property property) {
+        default PropertyModel convert(
+            com.bytechef.platform.workflow.task.dispatcher.registry.domain.Property property) {
+
             return (PropertyModel) property.accept(this);
         }
 

server/libs/platform/platform-workflow/platform-workflow-task-dispatcher/platform-workflow-task-dispatcher-api/src/main/java/com/bytechef/platform/workflow/task/dispatcher/definition/Property.java

@@ -44,6 +44,7 @@ enum ControlType implements BaseControlType {
         INTEGER,
         MULTI_SELECT,
         NUMBER,
+        OBJECT_BUILDER,
         PASSWORD,
         PHONE,
         SELECT,

server/libs/platform/platform-workflow/platform-workflow-task-dispatcher/platform-workflow-task-dispatcher-api/src/main/java/com/bytechef/platform/workflow/task/dispatcher/definition/TaskDispatcherDsl.java

@@ -914,7 +914,11 @@ public Optional<List<? extends Property>> getAdditionalProperties() {
 
         @Override
         public ControlType getControlType() {
-            return ControlType.SELECT;
+            if (options == null) {
+                return ControlType.OBJECT_BUILDER;
+            } else {
+                return ControlType.SELECT;
+            }
         }
 
         public Optional<Boolean> getMultipleValues() {