Added DMN Saving for checks.

Justin-MacIntosh · Justin-MacIntosh · commit 6c7050d4f2c5 · 2025-10-25T16:12:38.000-04:00
diff --git a/builder-api/src/main/java/org/acme/controller/EligibilityCheckResource.java b/builder-api/src/main/java/org/acme/controller/EligibilityCheckResource.java
@@ -73,6 +73,7 @@ public Response createCheck(@Context SecurityIdentity identity,
         //TODO: Add validations for user provided data
         newCheck.setOwnerId(userId);
         newCheck.setPublic(true); // By default all created checks are public
+        newCheck.setVersion("1");
         try {
             String checkId = eligibilityCheckRepository.saveNewCheck(newCheck);
             newCheck.setId(checkId);
diff --git a/builder-api/src/main/java/org/acme/model/domain/EligibilityCheck.java b/builder-api/src/main/java/org/acme/model/domain/EligibilityCheck.java
@@ -12,6 +12,7 @@ public class EligibilityCheck {
     private String description;
     private String version;
     private boolean isActive;
+    private String dmnModel;
     private List<InputDefinition> inputs;
     private List<ParameterDefinition> parameters;
     private String ownerId;
@@ -34,6 +35,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public void setDmnModel(String dmnModel){
+        this.dmnModel = dmnModel;
+    }
+
+    public String getDmnModel(){
+        return dmnModel;
+    }
+
     public String getModule() {
         return module;
     }
diff --git a/builder-api/src/main/java/org/acme/persistence/EligibilityCheckRepositoryImpl.java b/builder-api/src/main/java/org/acme/persistence/EligibilityCheckRepositoryImpl.java
@@ -5,11 +5,14 @@
 
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 import org.acme.constants.CollectionNames;
 import org.acme.constants.FieldNames;
 import org.acme.enums.OptionalBoolean;
 import org.acme.model.domain.Benefit;
 import org.acme.model.domain.EligibilityCheck;
+import org.acme.model.domain.Screener;
 
 import java.util.List;
 import java.util.Map;
@@ -18,6 +21,9 @@
 @ApplicationScoped
 public class EligibilityCheckRepositoryImpl implements EligibilityCheckRepository {
 
+    @Inject
+    private StorageService storageService;
+
     public List<EligibilityCheck> getAllPublicChecks(){
 
         List<Map<String, Object>> checkMaps = FirestoreUtils.getFirestoreDocsByField(
@@ -29,18 +35,20 @@ public List<EligibilityCheck> getAllPublicChecks(){
         return checks;    }
 
     public Optional<EligibilityCheck> getCheck(String checkId){
-
-        List<Map<String, Object>> checkMaps = FirestoreUtils.getFirestoreDocsByField(
-                CollectionNames.ELIGIBILITY_CHECK_COLLECTION, FieldNames.ID, checkId);
+        Optional<Map<String, Object>> dataOpt = FirestoreUtils.getFirestoreDocById(CollectionNames.ELIGIBILITY_CHECK_COLLECTION, checkId);
+        if (dataOpt.isEmpty()){
+            return Optional.empty();
+        }
+        Map<String, Object> data = dataOpt.get();
 
         ObjectMapper mapper = new ObjectMapper();
-        List<EligibilityCheck> checks = checkMaps.stream().map( checkMap ->  mapper.convertValue(checkMap, EligibilityCheck.class)).toList();
+        EligibilityCheck check = mapper.convertValue(data, EligibilityCheck.class);
 
-        if (checks.isEmpty()){
-            return Optional.empty();
-        } else {
-            return Optional.of(checks.getFirst());
-        }
+        String dmnPath = storageService.getCheckDmnModelPath(check.getModule(), checkId, check.getVersion());
+        Optional<String> dmnModel = storageService.getStringFromStorage(dmnPath);
+        dmnModel.ifPresent(check::setDmnModel);
+
+        return Optional.of(check);
     }
 
     public List<EligibilityCheck> getChecksInBenefit(Benefit benefit){
diff --git a/builder-frontend/src/api/check.ts b/builder-frontend/src/api/check.ts
@@ -95,6 +95,29 @@ export const updateCheck = async (check: EligibilityCheck) => {
   }
 };
 
+export const saveCheckDmn = async (checkId: string, dmnModel: string) => {
+  const url = apiUrl + "/save-check-dmn";
+  try {
+    const response = await authFetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+      },
+      body: JSON.stringify({ id: checkId, dmnModel: dmnModel }),
+    });
+
+    if (!response.ok) {
+      throw new Error(`DMN save failed with status: ${response.status}`);
+    }
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    console.error("Error saving DMN for check:", error);
+    throw error; // rethrow so you can handle it in your component if needed
+  }
+};
+
 export const fetchUserDefinedChecks = async (): Promise<EligibilityCheck[]> => {
   // Simulate an API call delay -- TODO: update to greater than 1ms delay
   await new Promise((resolve) => setTimeout(resolve, 1000));
diff --git a/builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/EligibilityCheckDetail.tsx b/builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/EligibilityCheckDetail.tsx
@@ -3,23 +3,26 @@ import { useParams } from "@solidjs/router";
 
 import Header from "../../../Header";
 import Loading from "../../../Loading";
+import ParameterModal from "./modals/ParameterModal";
+import KogitoDmnEditorView from "./KogitoDmnEditorView";
+
 import eligibilityCheckDetailResource from "./eligibilityCheckDetailResource";
 
 import type { EligibilityCheck, ParameterDefinition } from "@/types";
-import ParameterModal from "./modals/ParameterModal";
 
 
 const EligibilityCheckDetail = () => {
   const { checkId } = useParams();
 
   const [screenMode, setScreenMode] = createSignal<"inputs_params" | "dmn">("inputs_params");
+  const [tmpDmnModel, setTmpDmnModel] = createSignal<string>("");
 
   const { eligibilityCheck, actions, actionInProgress, initialLoadStatus } = (
     eligibilityCheckDetailResource(() => checkId)
   );
 
   return (
-    <div>
+    <div class="h-screen flex flex-col">
       <Show when={initialLoadStatus.loading() || actionInProgress()}>
         <Loading/>
       </Show>
@@ -37,6 +40,14 @@ const EligibilityCheckDetail = () => {
         >
           DMN Definition
         </div>
+        <Show when={screenMode() === "dmn"}>
+          <div
+            class="btn-default btn-gray"
+            onClick={() => actions.saveDmnModel(tmpDmnModel())}
+          >
+            Save DMN
+          </div>
+        </Show>
       </div>
 
       <Show when={eligibilityCheck().id !== undefined && !initialLoadStatus.loading()}>
@@ -45,9 +56,10 @@ const EligibilityCheckDetail = () => {
             <ParametersScreen eligibilityCheck={eligibilityCheck} addParameter={actions.addParameter}/>
           </Match>
           <Match when={screenMode() === "dmn"}>
-            <div class="p-2">
-              <h2 class="text-xl font-semibold mb-2">DMN</h2>
-            </div>
+            <KogitoDmnEditorView
+              dmnModel={() => eligibilityCheck().dmnModel}
+              setTmpDmnModel={setTmpDmnModel}
+            />
           </Match>
         </Switch>
       </Show>
@@ -74,7 +86,7 @@ const ParametersScreen = (
           Create New Parameter
         </div>
         <Show when={eligibilityCheck().parameters.length > 0} fallback={<p>No parameters defined.</p>}>
-          <ul class="list-disc list-inside">
+          <div class="flex flex-wrap gap-4">
             <For each={eligibilityCheck().parameters}>
               {(param) => (
                 <div
@@ -88,7 +100,7 @@ const ParametersScreen = (
                 </div>
               )}
             </For>
-          </ul>
+          </div>
         </Show>
       </div>
       {
diff --git a/builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/KogitoDmnEditorView.tsx b/builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/KogitoDmnEditorView.tsx
@@ -0,0 +1,63 @@
+import { onCleanup, onMount, Accessor, Setter } from "solid-js";
+
+import * as DmnEditor from "@kogito-tooling/kie-editors-standalone/dist/dmn";
+
+
+/* Utility function to trim starting and ending quotes from XML string */
+const trimXml = (xml: string): string => {
+  const firstChar: string = xml.charAt(0);
+  const lastChar: string = xml.charAt(xml.length - 1);
+
+  if (firstChar === '"' && lastChar === '"') {
+    // Return without starting and ending quotes
+    return xml.slice(1, -1);
+  }
+  return xml;
+};
+
+export default function KogitoDmnEditorView({
+  dmnModel, setTmpDmnModel,
+}: {
+  dmnModel: Accessor<string>;
+  setTmpDmnModel: Setter<string>;
+}) {
+  let editorElement: null | Element = null;
+  let editorObject: null | any = null;
+  let saveTimeoutId: null | number = null;
+
+  /* SolidJS Lifecycle */
+  onMount(async () => {
+    initializeEditor();
+  });
+  onCleanup(() => {
+    if (editorObject) editorObject.close();
+    if (saveTimeoutId) clearTimeout(saveTimeoutId);
+  });
+
+  const initializeEditor = async () => {
+    const modelXml: string = dmnModel();
+    const initialDmnPromise: string = (modelXml) ? trimXml(modelXml): "";
+
+    editorObject = DmnEditor.open({
+      container: editorElement,
+      initialContent: Promise.resolve(initialDmnPromise),
+      resources: new Map(),
+      readOnly: false,
+    });
+    editorObject.subscribeToContentChanges(
+      async (_: boolean) => {
+        const xml = await editorObject.getContent();
+        setTmpDmnModel(xml);
+      }
+    );
+  };
+
+  return (
+    <div class="h-full overflow-auto">
+      <div
+        class="h-full"
+        ref={ (el: HTMLDivElement) => (editorElement = el) }
+      />
+    </div>
+  );
+}
diff --git a/builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/eligibilityCheckDetailResource.ts b/builder-frontend/src/components/homeScreen/eligibilityCheckList/eligibilityCheckDetail/eligibilityCheckDetailResource.ts
@@ -1,15 +1,16 @@
 import { createResource, createEffect, Accessor, createSignal } from "solid-js";
 import { createStore } from "solid-js/store";
 
-import { fetchCheck, updateCheck } from "@/api/check";
+import { fetchCheck, saveCheckDmn, updateCheck } from "@/api/check";
 
-import type { EligibilityCheck, ParameterDefinition } from "@/types";
+import type { EligibilityCheckDetail, ParameterDefinition } from "@/types";
 
 
 export interface EligibilityCheckDetailResource {
-  eligibilityCheck: () => EligibilityCheck;
+  eligibilityCheck: () => EligibilityCheckDetail;
   actions: {
     addParameter: (parameterDef: ParameterDefinition) => Promise<void>;
+    saveDmnModel: (dmnString: string) => Promise<void>;
   };
   actionInProgress: Accessor<boolean>;
   initialLoadStatus: {
@@ -23,7 +24,7 @@ const eligibilityCheckDetailResource = (checkId: Accessor<string>): EligibilityC
   const [actionInProgress, setActionInProgress] = createSignal<boolean>(false);
 
   // Local fine-grained store
-  const [eligibilityCheck, setEligibilityCheck] = createStore<EligibilityCheck | null>(null);
+  const [eligibilityCheck, setEligibilityCheck] = createStore<EligibilityCheckDetail | null>(null);
 
   // When resource resolves, sync it into the store
   createEffect(() => {
@@ -33,7 +34,7 @@ const eligibilityCheckDetailResource = (checkId: Accessor<string>): EligibilityC
   });
 
   const addParameter = async (parameterDef: ParameterDefinition) => {
-    const updatedCheck: EligibilityCheck = { ...eligibilityCheck, parameters: [...eligibilityCheck.parameters, parameterDef] };
+    const updatedCheck: EligibilityCheckDetail = { ...eligibilityCheck, parameters: [...eligibilityCheck.parameters, parameterDef] };
     setActionInProgress(true);
     try {
       await updateCheck(updatedCheck);
@@ -44,9 +45,23 @@ const eligibilityCheckDetailResource = (checkId: Accessor<string>): EligibilityC
     setActionInProgress(false);
   };
 
+  const saveDmnModel = async (dmnString: string) => {
+    setActionInProgress(true);
+    try {
+      await saveCheckDmn(eligibilityCheck.id, dmnString);
+      await refetch();
+    } catch (e) {
+      console.error("Failed to save DMN model", e);
+    }
+    setActionInProgress(false);
+  }
+
   return {
     eligibilityCheck: () => eligibilityCheck,
-    actions: { addParameter },
+    actions: {
+      addParameter,
+      saveDmnModel,
+    },
     actionInProgress,
     initialLoadStatus: {
       loading: () => eligibilityCheckResource.loading,
diff --git a/builder-frontend/src/components/project/KogitoDmnEditorView.jsx b/builder-frontend/src/components/project/KogitoDmnEditorView.jsx
diff --git a/builder-frontend/src/types.ts b/builder-frontend/src/types.ts
