3827 Additional fixes

Author: ivicac

server/libs/modules/components/form/src/main/java/com/bytechef/component/form/constant/FormConstants.java

@@ -32,7 +32,6 @@ public class FormConstants {
     public static final String FIELD_TYPE = "fieldType";
     public static final String FORM = "form";
     public static final String FORM_DESCRIPTION = "formDescription";
-//    public static final String FORM_PATH = "formPath";
     public static final String FORM_TITLE = "formTitle";
     public static final String IGNORE_BOTS = "ignoreBots";
     public static final String INPUTS = "inputs";
@@ -68,7 +67,7 @@ public int getValue() {
             return value;
         }
 
-        public static FieldType valueOf(int value) {
+        public static FieldType fromValue(int value) {
             for (FieldType fieldType : FieldType.values()) {
                 if (fieldType.value == value) {
                     return fieldType;

server/libs/modules/components/form/src/main/java/com/bytechef/component/form/trigger/NewFormRequestTrigger.java

@@ -91,10 +91,6 @@ public class NewFormRequestTrigger {
                 .label("Form Description")
                 .description("A subtitle shown under the form title. Use \n or <br> for line breaks.")
                 .required(false),
-//            string(FORM_PATH)
-//                .label("Form Path")
-//                .description("Custom slug for the form URL path.")
-//                .required(false),
             string(BUTTON_LABEL)
                 .label("Button Label")
                 .description("Label for the submit button.")
@@ -159,7 +155,8 @@ public class NewFormRequestTrigger {
                                 .description("The placeholder text.")
                                 .required(false)
                                 .displayCondition("contains({%s,%s,%s,%s,%s}, fieldType)".formatted(
-                                    EMAIL_INPUT, INPUT, NUMBER_INPUT, PASSWORD_INPUT, TEXTAREA)),
+                                    EMAIL_INPUT.getValue(), INPUT.getValue(), NUMBER_INPUT.getValue(),
+                                    PASSWORD_INPUT.getValue(), TEXTAREA.getValue())),
                             string(DEFAULT_VALUE)
                                 .label("Default value")
                                 .description("Pre-filled or pre-selected value for compatible fields.")
@@ -185,14 +182,14 @@ public class NewFormRequestTrigger {
                                                 .required(true)))
                                 .required(false)
                                 .displayCondition(
-                                    "contains({%s,%s}, provider)".formatted(RADIO.getValue(), SELECT.getValue())),
+                                    "contains({%s,%s}, fieldType)".formatted(RADIO.getValue(), SELECT.getValue())),
                             bool(MULTIPLE_CHOICE)
                                 .label("Multiple Choice")
                                 .description("Allow multiple selections.")
                                 .defaultValue(false)
                                 .required(false)
                                 .displayCondition(
-                                    "fieldType == %s and multipleChoice == true".formatted(SELECT.getValue())),
+                                    "fieldType == %s".formatted(SELECT.getValue())),
                             integer(MIN_SELECTION)
                                 .label("Min selection")
                                 .description("Minimum selections required.")
@@ -203,7 +200,8 @@ public class NewFormRequestTrigger {
                                 .label("Max selection")
                                 .description("Maximum selections allowed.")
                                 .required(false)
-                                .displayCondition("fieldType == %s".formatted(CHECKBOX.getValue())),
+                                .displayCondition(
+                                    "fieldType == %s and multipleChoice == true".formatted(SELECT.getValue())),
                             bool(REQUIRED)
                                 .label("Required")
                                 .description("Whether this field is required")
@@ -230,7 +228,7 @@ protected static OutputResponse getOutput(
             }
 
             Integer fieldTypeInt = (Integer) input.get(FIELD_TYPE);
-            FieldType fieldType = valueOf(fieldTypeInt);
+            FieldType fieldType = fromValue(fieldTypeInt);
 
             ModifiableValueProperty<?, ?> property = switch (fieldType) {
                 case CHECKBOX -> bool(fieldName);
@@ -253,7 +251,7 @@ protected static OutputResponse getOutput(
         return OutputResponse.of(
             object()
                 .properties(
-                    number("submittedAt"),
+                    string("submittedAt"),
                     object("body")
                         .properties(properties.toArray(new ModifiableValueProperty[0]))));
     }
@@ -279,14 +277,14 @@ protected static OutputResponse getOutput(
         }
 
         @SuppressWarnings("unchecked")
-        Map<String, Object> bodyContent = new HashMap<>((Map<String, Object>) body.getContent());
+        Map<String, Object> content = new HashMap<>((Map<String, Object>) body.getContent());
 
         boolean useWorkflowTimezone = inputParameters.getBoolean(USE_WORKFLOW_TIMEZONE, false);
 
         if (!useWorkflowTimezone) {
-            bodyContent.put("submittedAt", String.valueOf(Instant.now(Clock.systemUTC())));
+            content.put("submittedAt", String.valueOf(Instant.now(Clock.systemUTC())));
         }
 
-        return bodyContent;
+        return content;
     }
 }

server/libs/modules/components/form/src/test/java/com/bytechef/component/form/FormComponentHandlerTest.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 ByteChef
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bytechef.component.form;
+
+import com.bytechef.test.jsonasssert.JsonFileAssert;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Ivica Cardic
+ */
+public class FormComponentHandlerTest {
+
+    @Test
+    public void testGetDefinition() {
+        JsonFileAssert.assertEquals("definition/form_v1.json", new FormComponentHandler().getDefinition());
+    }
+}