Support boolean arguments in formio.

Author: YaytayAtWork

query-engine/docs/query-engine-compose.yml

@@ -59,7 +59,7 @@ services:
     - 14268:14268
 
   query-engine:
-    image: ghcr.io/yaytay/query-engine-design-mode:0.0.39-3-main
+    image: ghcr.io/yaytay/query-engine-design-mode:0.0.40-main
     ports:
     - 2000:8080
     volumes:

query-engine/src/main/java/uk/co/spudsoft/query/main/Version.java

@@ -34,7 +34,7 @@ public final class Version {
   /**
    * The project version, as set in the Maven pom.xml.
    */
-  public static final String MAVEN_PROJECT_VERSION = "0.0.39-3-main";
+  public static final String MAVEN_PROJECT_VERSION = "0.0.40-main";
 
   private Version() {
   }

query-engine/src/main/java/uk/co/spudsoft/query/web/LoginRouter.java

@@ -28,7 +28,7 @@
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.VertxContextPRNG;
+import io.vertx.ext.auth.prng.VertxContextPRNG;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.client.WebClient;
 import java.net.URLEncoder;

query-engine/src/main/java/uk/co/spudsoft/query/web/formio/CheckBox.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2023 jtalbut
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package uk.co.spudsoft.query.web.formio;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.IOException;
+
+/**
+ * Output a formio TextField component.
+ *
+ * @author jtalbut
+ */
+public class CheckBox extends Component<CheckBox> {
+
+  /**
+   * Constructor.
+   * 
+   * @param generator The Jackson JsonGenerator for FormIO.
+   * @throws IOException if something goes wrong.
+   */
+  @SuppressFBWarnings({"EI_EXPOSE_REP2", "CT_CONSTRUCTOR_THROW"})
+  public CheckBox(JsonGenerator generator) throws IOException {
+    super(generator, "checkbox");
+  }
+  
+}

query-engine/src/main/java/uk/co/spudsoft/query/web/formio/FormBuilder.java

@@ -35,6 +35,7 @@
 import uk.co.spudsoft.query.defn.Argument;
 import uk.co.spudsoft.query.defn.DataType;
 import uk.co.spudsoft.query.defn.ArgumentValue;
+import static uk.co.spudsoft.query.defn.DataType.Null;
 import uk.co.spudsoft.query.defn.Format;
 import uk.co.spudsoft.query.exec.FilterFactory;
 import uk.co.spudsoft.query.exec.conditions.ConditionInstance;
@@ -169,25 +170,22 @@ void buildArguments(JsonGenerator generator, PipelineFile pipeline) throws IOExc
 
   private void buildArgument(Argument arg, JsonGenerator generator) throws IOException, IllegalStateException {
     switch (arg.getType()) {
-      case Date:
-      case Time:
-      case DateTime:
-        buildDateTime(generator, arg);
-        break;
-      case Double:
-      case Integer:
-      case Long:
-        buildNumber(generator, arg);
-        break;
-      case String:
+      case Date, Time, DateTime -> buildDateTime(generator, arg);
+      case Double, Integer, Long, Float -> buildNumber(generator, arg);
+      case String -> {
         if (!isNullOrEmpty(arg.getPossibleValues()) || !Strings.isNullOrEmpty(arg.getPossibleValuesUrl())) {
           buildSelect(generator, arg);
         } else {
           buildTextField(generator, arg);
         }
-        break;
-      default:
-        throw new IllegalStateException("New types added to DataType and not implemented here");
+      }
+      case Boolean -> buildCheckBox(generator, arg);
+      case Null -> {
+        logger.warn("Argument {} is of null type", arg.getName());
+      }
+      default -> {
+        logger.warn("Argument {} is of unknown type ({})", arg.getName(), arg.getType());
+      }
     }
   }
 
@@ -355,6 +353,36 @@ static LocalDateTime parseToLocalDateTime(String value) {
     }
   }
 
+  void buildCheckBox(JsonGenerator generator, Argument arg) throws IOException {
+    try (CheckBox checkbox = new CheckBox(generator)) {
+      checkbox
+            .withLabel(arg.getTitle())
+            .withPlaceholder(arg.getPrompt())
+            .withDescription(arg.getDescription())
+            .withKey(arg.getName())
+            .withMultiple(arg.isMultiValued())
+            ;
+      if (!Strings.isNullOrEmpty(arg.getDefaultValueExpression())) {
+        JexlEvaluator evaluator = new JexlEvaluator(arg.getDefaultValueExpression());
+        Object result = evaluator.evaluateAsObject(requestContext, null);
+        if (result != null) {
+          try {
+            Boolean defaultBoolean = (Boolean) DataType.Boolean.cast(result);
+            if (defaultBoolean != null) {
+              checkbox.withDefaultValue(defaultBoolean.toString());
+            }
+          } catch (Throwable ex) {
+            checkbox.withDefaultValue(result.toString());
+          }
+        }        
+      }
+      
+      try (Validation v = checkbox.addValidate()) {
+        v.withRequired(!arg.isOptional());
+      }
+    }    
+  }
+  
   void buildDateTime(JsonGenerator generator, Argument arg) throws IOException {    
     try (DateTime dateTime = new DateTime(generator)) {
       dateTime