added module to checkConfig

Author: Michael-Dratch

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

@@ -11,6 +11,7 @@ public class CheckConfig {
     private String checkId;
     private String checkName;
     private String checkVersion;
+    private String checkModule;
     private Map<String, Object> parameters;
     // evaluation endpoint url for library checks
     private String evaluationUrl;
@@ -72,4 +73,12 @@ public String getCheckVersion() {
     public void setCheckVersion(String checkVersion) {
         this.checkVersion = checkVersion;
     }
+
+    public String getCheckModule() {
+        return checkModule;
+    }
+
+    public void setCheckModule(String checkModule) {
+        this.checkModule = checkModule;
+    }
 }

builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/ParametersConfiguration.tsx

@@ -51,6 +51,7 @@ const ParametersConfiguration = ({
         <Show
           when={
             eligibilityCheck() &&
+            eligibilityCheck().parameterDefinitions &&
             eligibilityCheck().parameterDefinitions.length > 0
           }
           fallback={<p>No parameters defined.</p>}

builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/PublishCheck.tsx

@@ -21,9 +21,35 @@ const PublishCheck = ({
     if (!checks) return [];
     return checks
       .slice()
-      .sort((check1, check2) => check2.version - check1.version);
+      .sort((check1, check2) =>
+        reverseCompareVersions(check1.version, check2.version)
+      );
   };
 
+  // Called reverse compare because we are sorting the largest version number first
+  function reverseCompareVersions(a: string, b: string): number {
+    const aValues = normalize(a);
+    const bValues = normalize(b);
+
+    for (let i = 0; i < 3; i++) {
+      if (aValues[i] !== bValues[i]) {
+        // The order of this subtraction is what reverses the sort order
+        return bValues[i] - aValues[i];
+      }
+    }
+    return 0;
+  }
+
+  function normalize(version: string): [number, number, number] {
+    const parts = version.split(".").map(Number);
+
+    while (parts.length < 3) {
+      parts.push(0);
+    }
+
+    return [parts[0], parts[1], parts[2]];
+  }
+
   return (
     <div class="p-12">
       <div class="text-3xl font-bold tracking-wide mb-2">

builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/checkTesting/EligibilityCheckTest.tsx

@@ -29,6 +29,7 @@ const EligibilityCheckTest = ({
     checkId: eligibilityCheck().id,
     checkName: eligibilityCheck().name,
     checkVersion: eligibilityCheck().version,
+    checkModule: eligibilityCheck().module,
     checkDescription: eligibilityCheck().description,
     parameterDefinitions: eligibilityCheck().parameterDefinitions,
     inputDefinition: eligibilityCheck().inputDefinition,

builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx

@@ -57,6 +57,7 @@ const EligibilityCheckListView = ({
       checkId: check.id,
       checkName: check.name,
       checkVersion: check.version,
+      checkModule: check.module,
       checkDescription: check.description,
       evaluationUrl: check.evaluationUrl,
       parameters: {},

builder-frontend/src/components/project/manageBenefits/configureBenefit/SelectedEligibilityCheck.tsx

@@ -63,29 +63,30 @@ const SelectedEligibilityCheck = ({
         {
           // Place to display information about expected inputs for check
         }
-        {checkConfig().parameterDefinitions.length > 0 && (
-          <div class="[&:has(+div)]:mb-2">
-            <div class="text-lg font-bold pl-2">Parameters</div>
-            <For each={checkConfig().parameterDefinitions}>
-              {(parameter: ParameterDefinition) => {
-                const getLabel = () => {
-                  let value = checkConfig().parameters[parameter.key];
-                  return value !== undefined ? (
-                    value.toString()
-                  ) : (
-                    <span class="text-yellow-700">Not configured</span>
+        {checkConfig().parameterDefinitions &&
+          checkConfig().parameterDefinitions.length > 0 && (
+            <div class="[&:has(+div)]:mb-2">
+              <div class="text-lg font-bold pl-2">Parameters</div>
+              <For each={checkConfig().parameterDefinitions}>
+                {(parameter: ParameterDefinition) => {
+                  const getLabel = () => {
+                    let value = checkConfig().parameters[parameter.key];
+                    return value !== undefined ? (
+                      value.toString()
+                    ) : (
+                      <span class="text-yellow-700">Not configured</span>
+                    );
+                  };
+                  return (
+                    <div class="flex gap-2 pl-4">
+                      <div>{titleCase(parameter.key)}:</div>
+                      <div>{getLabel()}</div>
+                    </div>
                   );
-                };
-                return (
-                  <div class="flex gap-2 pl-4">
-                    <div>{titleCase(parameter.key)}:</div>
-                    <div>{getLabel()}</div>
-                  </div>
-                );
-              }}
-            </For>
-          </div>
-        )}
+                }}
+              </For>
+            </div>
+          )}
         {unfilledRequiredParameters().length > 0 && (
           <div class="mt-2 text-yellow-700 font-bold">
             Warning: This check has required parameter(s) that are not

builder-frontend/src/components/project/manageBenefits/configureBenefit/benefitResource.ts

@@ -62,10 +62,7 @@ const createScreenerBenefits = (
   // Actions
   const addCheck = (newCheck: CheckConfig) => {
     if (!benefit) return;
-    console.log("updating benefit");
     const updatedChecks: CheckConfig[] = [...benefit.checks, newCheck];
-    console.log("checks after upate");
-    console.log(updatedChecks);
     const updatedBenefit: Benefit = { ...benefit, checks: updatedChecks };
     updateBenefit(updatedBenefit);
   };

builder-frontend/src/components/project/manageBenefits/configureBenefit/modals/ConfigureCheckModal.tsx

@@ -26,6 +26,7 @@ const ConfigureCheckModal = ({
     checkId: checkConfig().checkId,
     checkName: checkConfig().checkName,
     checkVersion: checkConfig().checkVersion,
+    checkModule: checkConfig().checkModule,
     checkDescription: checkConfig().checkDescription,
     evaluationUrl: checkConfig().evaluationUrl,
     parameterDefinitions: checkConfig().parameterDefinitions,

builder-frontend/src/types.ts

@@ -20,6 +20,7 @@ export interface CheckConfig {
   checkId: string;
   checkName: string;
   checkVersion: string;
+  checkModule: string;
   checkDescription: string;
   // API endpoint for evaluating check (only for library checks)
   evaluationUrl?: string;