feat: allow select & multiple select to have custom input options wit…

…h new property `allowInput` close #4696
kestra-io · Sep 10, 2024 · b321962 · b321962
1 parent af4fc14
commit b321962
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/core/src/main/java/io/kestra/core/models/flows/input/MultiselectInput.java b/core/src/main/java/io/kestra/core/models/flows/input/MultiselectInput.java
@@ -6,6 +6,7 @@
 import io.kestra.core.validations.Regex;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -38,6 +39,14 @@ public class MultiselectInput extends Input<List<String>> implements ItemTypeInt
     @Builder.Default
     private Type itemType = Type.STRING;
 
+
+    @Schema(
+        title = "If the user can provide customs value."
+    )
+    @NotNull
+    @Builder.Default
+    Boolean allowInput = false;
+
     @Override
     public void validate(List<String> inputs) throws ConstraintViolationException {
         if (values != null && options != null) {
@@ -50,16 +59,18 @@ public void validate(List<String> inputs) throws ConstraintViolationException {
             );
         }
 
-        for(String input : inputs){
-            List<@Regex String> finalValues = this.values != null ? this.values : this.options;
-            if (!finalValues.contains(input)) {
-                throw ManualConstraintViolation.toConstraintViolationException(
-                    "it must match the values `" + finalValues + "`",
-                    this,
-                    MultiselectInput.class,
-                    getId(),
-                    input
-                );
+        if (!this.getAllowInput()) {
+            for (String input : inputs) {
+                List<@Regex String> finalValues = this.values != null ? this.values : this.options;
+                if (!finalValues.contains(input)) {
+                    throw ManualConstraintViolation.toConstraintViolationException(
+                        "it must match the values `" + finalValues + "`",
+                        this,
+                        MultiselectInput.class,
+                        getId(),
+                        input
+                    );
+                }
             }
         }
     }

diff --git a/core/src/main/java/io/kestra/core/models/flows/input/SelectInput.java b/core/src/main/java/io/kestra/core/models/flows/input/SelectInput.java
@@ -6,6 +6,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -22,9 +23,20 @@ public class SelectInput extends Input<String> {
     @NotNull
     List<@Regex String> values;
 
+    @Schema(
+        title = "If the user can provide a custom value."
+    )
+    @NotNull
+    @Builder.Default
+    Boolean allowInput = false;
+
+
     @Override
     public void validate(String input) throws ConstraintViolationException {
         if (!values.contains(input) & this.getRequired()) {
+            if (this.getAllowInput()) {
+                return;
+            }
             throw ManualConstraintViolation.toConstraintViolationException(
                 "it must match the values `" + values + "`",
                 this,

diff --git a/ui/src/components/inputs/InputsForm.vue b/ui/src/components/inputs/InputsForm.vue
@@ -22,6 +22,8 @@
                 v-if="input.type === 'ENUM' || input.type === 'SELECT'"
                 v-model="inputs[input.id]"
                 @update:model-value="onChange"
+                :allow-create="input.allowInput"
+                filterable
             >
                 <el-option
                     v-for="item in input.values"
@@ -40,6 +42,8 @@
                 v-model="multiSelectInputs[input.id]"
                 @update:model-value="onMultiSelectChange(input.id, $event)"
                 multiple
+                filterable
+                :allow-create="input.allowInput"
             >
                 <el-option
                     v-for="item in (input.values ?? input.options)"