Library check evaluation, most recent kogito version only

Author: Michael-Dratch

builder-api/src/main/java/org/acme/controller/DecisionResource.java

@@ -136,9 +136,7 @@ private Map<String, Object> evaluateBenefit(Benefit benefit, Map<String, Object>
                 String dmnFilepath = storageService.getCheckDmnModelPath(checkConfig.getCheckId());
                 EvaluationResult evaluationResult;
                 if (isLibraryCheck(checkConfig)){
-
-                    String evaluationUrl = checkConfig.getEvaluationUrl();
-                    evaluationResult = libraryApi.evaluateCheck(checkConfig, evaluationUrl, formData);
+                    evaluationResult = libraryApi.evaluateCheck(checkConfig, formData);
                 } else {
                     Map<String, Object> customFormValues = (Map<String, Object>) formData.get("custom");
                     if (customFormValues == null) {

builder-api/src/main/java/org/acme/model/domain/EligibilityCheck.java

@@ -1,7 +1,6 @@
 package org.acme.model.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import java.util.List;
@@ -18,7 +17,7 @@ public class EligibilityCheck {
     private List<ParameterDefinition> parameterDefinitions;
     private String ownerId;
     // API endpoint for evaluating library checks
-    private String path;
+    private String evaluationUrl;
     private Boolean isArchived;
 
     public String getId() {
@@ -93,12 +92,12 @@ public void setInputDefinition(JsonNode inputDefinition) {
         this.inputDefinition = inputDefinition;
     }
 
-    public String getPath() {
-        return path;
+    public String getEvaluationUrl() {
+        return evaluationUrl;
     }
 
-    public void setPath(String path) {
-        this.path = path;
+    public void setEvaluationUrl(String evaluationUrl) {
+        this.evaluationUrl = evaluationUrl;
     }
 
     public Boolean getIsArchived() {

builder-api/src/main/java/org/acme/service/LibraryApiService.java

@@ -76,7 +76,9 @@ public EligibilityCheck getById(String id) {
          return matches.getFirst();
     }
 
-    public EvaluationResult evaluateCheck(CheckConfig checkConfig, String evaluationUrl, Map<String, Object> inputs) throws JsonProcessingException {
+    public EvaluationResult evaluateCheck(CheckConfig checkConfig, Map<String, Object> inputs) throws JsonProcessingException {
+
+        // TODO: Check that checkConfig has required attributes and handle null values
 
         Map<String, Object> data = new HashMap<>();
         data.put("parameters", checkConfig.getParameters());
@@ -87,7 +89,7 @@ public EvaluationResult evaluateCheck(CheckConfig checkConfig, String evaluation
         HttpClient client = HttpClient.newHttpClient();
 
         HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create("https://library-api-cnsoqyluna-uc.a.run.app/api/v1/checks/age/person-min-age"))
+                .uri(URI.create("https://library-api-cnsoqyluna-uc.a.run.app" + checkConfig.getEvaluationUrl()))
                 .header("Content-Type", "application/json")
                 .POST(HttpRequest.BodyPublishers.ofString(bodyJson))
                 .build();

builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/eligibilityCheckDetailResource.ts

@@ -71,7 +71,7 @@ const eligibilityCheckDetailResource = (
     const updatedCheck: EligibilityCheckDetail = {
       ...eligibilityCheck,
       parameterDefinitions: [
-        ...eligibilityCheck.parameterDefinitions,
+        ...(eligibilityCheck.parameterDefinitions || []),
         parameterDef,
       ],
     };

builder-frontend/src/components/project/FormEditorView.tsx

@@ -1,24 +1,34 @@
-import { onMount, onCleanup, createSignal, createResource, Switch, Match, For, Show } from "solid-js";
+import {
+  onMount,
+  onCleanup,
+  createSignal,
+  createResource,
+  Switch,
+  Match,
+  For,
+  Show,
+} from "solid-js";
 import { useParams } from "@solidjs/router";
 
 import { FormEditor } from "@bpmn-io/form-js-editor";
-import Drawer from '@corvu/drawer' // 'corvu/drawer'
+import Drawer from "@corvu/drawer"; // 'corvu/drawer'
 
 import FilterFormComponentsModule from "./formJsExtensions/FilterFormComponentsModule";
 import CustomFormFieldsModule from "./formJsExtensions/customFormFields";
 
 import { saveFormSchema } from "../../api/screener";
 import { fetchScreenerBenefit } from "../../api/benefit";
-import { extractFormPaths, extractJsonSchemaPaths } from "../../utils/formSchemaUtils";
+import {
+  extractFormPaths,
+  extractJsonSchemaPaths,
+} from "../../utils/formSchemaUtils";
 import Loading from "../Loading";
 
 import type { Benefit, BenefitDetail } from "../../types";
 
-
 import "@bpmn-io/form-js/dist/assets/form-js.css";
 import "@bpmn-io/form-js-editor/dist/assets/form-js-editor.css";
 
-
 function FormEditorView({ project, formSchema, setFormSchema }) {
   const [isUnsaved, setIsUnsaved] = createSignal(false);
   const [isSaving, setIsSaving] = createSignal(false);
@@ -31,7 +41,7 @@ function FormEditorView({ project, formSchema, setFormSchema }) {
       if (!benefitDetails?.length) return [];
       const screenerId = params.projectId;
       return Promise.all(
-        benefitDetails.map(b => fetchScreenerBenefit(screenerId, b.id))
+        benefitDetails.map((b) => fetchScreenerBenefit(screenerId, b.id))
       );
     }
   );
@@ -51,8 +61,8 @@ function FormEditorView({ project, formSchema, setFormSchema }) {
     formEditor = new FormEditor({
       container,
       additionalModules: [
-        FilterFormComponentsModule,
-        CustomFormFieldsModule
+        // FilterFormComponentsModule,
+        CustomFormFieldsModule,
       ],
     });
 
@@ -108,7 +118,10 @@ function FormEditorView({ project, formSchema, setFormSchema }) {
                 </div>
               </Match>
               <Match when={isSaving()}>
-                <div onClick={handleSave} class="btn-default btn-gray cursor-not-allowed">
+                <div
+                  onClick={handleSave}
+                  class="btn-default btn-gray cursor-not-allowed"
+                >
                   Saving...
                 </div>
               </Match>
@@ -126,9 +139,9 @@ function FormEditorView({ project, formSchema, setFormSchema }) {
   );
 }
 
-
 const FormValidationDrawer = ({ formSchema, benefits }) => {
-  const formOutputs = () => formSchema() ? extractFormPaths(formSchema()) : [];
+  const formOutputs = () =>
+    formSchema() ? extractFormPaths(formSchema()) : [];
 
   // Extract expected inputs from all benefits' checks
   const expectedInputs = () => {
@@ -138,7 +151,7 @@ const FormValidationDrawer = ({ formSchema, benefits }) => {
     for (const benefit of allBenefits) {
       for (const check of benefit.checks || []) {
         const paths = extractJsonSchemaPaths(check.inputDefinition);
-        paths.forEach(p => pathSet.add(p));
+        paths.forEach((p) => pathSet.add(p));
       }
     }
     return Array.from(pathSet);
@@ -148,10 +161,10 @@ const FormValidationDrawer = ({ formSchema, benefits }) => {
   const formOutputSet = () => new Set(formOutputs());
 
   const satisfiedInputs = () =>
-    expectedInputs().filter(p => formOutputSet().has(p));
+    expectedInputs().filter((p) => formOutputSet().has(p));
 
   const missingInputs = () =>
-    expectedInputs().filter(p => !formOutputSet().has(p));
+    expectedInputs().filter((p) => !formOutputSet().has(p));
 
   return (
     <Drawer side="right">
@@ -173,7 +186,11 @@ const FormValidationDrawer = ({ formSchema, benefits }) => {
                 fixed inset-0 z-50
                 data-transitioning:transition-colors data-transitioning:duration-500
                 data-transitioning:ease-[cubic-bezier(0.32,0.72,0,1)]"
-              style={{'background-color': `rgb(0 0 0 / ${0.5 * props.openPercentage})`}}
+              style={{
+                "background-color": `rgb(0 0 0 / ${
+                  0.5 * props.openPercentage
+                })`,
+              }}
             />
             <Drawer.Content
               class="
@@ -189,8 +206,17 @@ const FormValidationDrawer = ({ formSchema, benefits }) => {
 
               {/* Form Outputs Section */}
               <div class="mt-4 mr-10 px-4 pb-10">
-                <h3 class="text-lg font-semibold text-gray-700 mb-2">Form Outputs</h3>
-                <For each={formOutputs()} fallback={<p class="text-gray-500 italic text-sm">No form fields defined yet.</p>}>
+                <h3 class="text-lg font-semibold text-gray-700 mb-2">
+                  Form Outputs
+                </h3>
+                <For
+                  each={formOutputs()}
+                  fallback={
+                    <p class="text-gray-500 italic text-sm">
+                      No form fields defined yet.
+                    </p>
+                  }
+                >
                   {(path) => (
                     <div class="py-2 px-3 mb-2 bg-white rounded border border-gray-300 font-mono text-sm">
                       {path}
@@ -201,8 +227,17 @@ const FormValidationDrawer = ({ formSchema, benefits }) => {
 
               {/* Missing Inputs Section */}
               <div class="mt-4 mr-10 px-4">
-                <h3 class="text-lg font-semibold text-red-900 mb-2">Missing Inputs</h3>
-                <For each={missingInputs()} fallback={<p class="text-gray-500 italic text-sm">All required inputs are satisfied!</p>}>
+                <h3 class="text-lg font-semibold text-red-900 mb-2">
+                  Missing Inputs
+                </h3>
+                <For
+                  each={missingInputs()}
+                  fallback={
+                    <p class="text-gray-500 italic text-sm">
+                      All required inputs are satisfied!
+                    </p>
+                  }
+                >
                   {(path) => (
                     <div class="py-2 px-3 mb-2 bg-red-50 rounded border border-red-300 font-mono text-sm text-red-800">
                       {path}
@@ -213,8 +248,17 @@ const FormValidationDrawer = ({ formSchema, benefits }) => {
 
               {/* Satisfied Inputs Section */}
               <div class="mt-4 mr-10 px-4">
-                <h3 class="text-lg font-semibold text-green-900 mb-2">Satisfied Inputs</h3>
-                <For each={satisfiedInputs()} fallback={<p class="text-gray-500 italic text-sm">No inputs satisfied yet.</p>}>
+                <h3 class="text-lg font-semibold text-green-900 mb-2">
+                  Satisfied Inputs
+                </h3>
+                <For
+                  each={satisfiedInputs()}
+                  fallback={
+                    <p class="text-gray-500 italic text-sm">
+                      No inputs satisfied yet.
+                    </p>
+                  }
+                >
                   {(path) => (
                     <div class="py-2 px-3 mb-2 bg-green-50 rounded border border-green-300 font-mono text-sm text-green-800">
                       {path}
@@ -227,7 +271,7 @@ const FormValidationDrawer = ({ formSchema, benefits }) => {
         </>
       )}
     </Drawer>
-  )
-}
+  );
+};
 
 export default FormEditorView;

builder-frontend/src/components/project/preview/Results.tsx

@@ -6,15 +6,15 @@ import checkIcon from "../../../assets/images/checkIcon.svg";
 import questionIcon from "../../../assets/images/questionIcon.svg";
 import xIcon from "../../../assets/images/xIcon.svg";
 
-
-export default function Results(
-  { inputData, results, resultsLoading }:
-  {
-    inputData: Accessor<PreviewFormData>,
-    results: Accessor<ScreenerResult>,
-    resultsLoading: Accessor<boolean>
-  }
-) {
+export default function Results({
+  inputData,
+  results,
+  resultsLoading,
+}: {
+  inputData: Accessor<PreviewFormData>;
+  results: Accessor<ScreenerResult>;
+  resultsLoading: Accessor<boolean>;
+}) {
   return (
     <div class="ml-3">
       <div class="mt-3">
@@ -27,7 +27,9 @@ export default function Results(
                   {([key, value]) => (
                     <tr class="text-md text-gray-700">
                       <td class="px-3 py-2 font-mono font-bold">{key}:</td>
-                      <td class="px-3 py-2 font-mono">{value?.toString() || "--"}</td>
+                      <td class="px-3 py-2 font-mono">
+                        {JSON.stringify(value, null, 2) || "--"}
+                      </td>
                     </tr>
                   )}
                 </For>
@@ -39,7 +41,13 @@ export default function Results(
           <Show when={resultsLoading()}>
             <div class="text-gray-600">Loading results...</div>
           </Show>
-          <Show when={!resultsLoading() && results() && Object.keys(results()).length > 0}>
+          <Show
+            when={
+              !resultsLoading() &&
+              results() &&
+              Object.keys(results()).length > 0
+            }
+          >
             <div class="text-md font-semibold text-gray-600">Benefits</div>
             <div class="p-2">
               <div class="flex flex-col space-y-2">
@@ -59,7 +67,9 @@ export default function Results(
                               Ineligible
                             </span>
                           </Match>
-                          <Match when={benefit.result === "UNABLE_TO_DETERMINE"}>
+                          <Match
+                            when={benefit.result === "UNABLE_TO_DETERMINE"}
+                          >
                             <span class="mb-3 bg-yellow-200 w-fit py-1 px-4 rounded-full font-bold text-gray-800">
                               Need more information
                             </span>
@@ -74,13 +84,29 @@ export default function Results(
                                 {check.name}:{" "}
                                 <Switch>
                                   <Match when={check.result === "TRUE"}>
-                                    <img src={checkIcon} alt="" class="inline w-4" />
+                                    <img
+                                      src={checkIcon}
+                                      alt=""
+                                      class="inline w-4"
+                                    />
                                   </Match>
                                   <Match when={check.result === "FALSE"}>
-                                    <img src={xIcon} alt="" class="inline w-4" />
+                                    <img
+                                      src={xIcon}
+                                      alt=""
+                                      class="inline w-4"
+                                    />
                                   </Match>
-                                  <Match when={check.result === "UNABLE_TO_DETERMINE"}>
-                                    <img src={questionIcon} alt="" class="inline w-4" />
+                                  <Match
+                                    when={
+                                      check.result === "UNABLE_TO_DETERMINE"
+                                    }
+                                  >
+                                    <img
+                                      src={questionIcon}
+                                      alt=""
+                                      class="inline w-4"
+                                    />
                                   </Match>
                                 </Switch>
                               </div>