From cd1255b6e46d44492aabe4f3d738a56d80ca6282 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Tue, 9 Dec 2025 21:32:34 -0500 Subject: [PATCH 01/15] add new border, add new buttons --- .../components/project/preview/Preview.tsx | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/builder-frontend/src/components/project/preview/Preview.tsx b/builder-frontend/src/components/project/preview/Preview.tsx index e7049585..adcb9c15 100644 --- a/builder-frontend/src/components/project/preview/Preview.tsx +++ b/builder-frontend/src/components/project/preview/Preview.tsx @@ -6,6 +6,7 @@ import Results from "./Results"; import { evaluateScreener } from "../../../api/screener"; import { PreviewFormData, ScreenerResult } from "./types"; +import { Button } from "solid-bootstrap"; const Preview = ({ project, formSchema }) => { @@ -35,6 +36,10 @@ const Preview = ({ project, formSchema }) => { setResultsLoading(false); }; + const handleTest = async () => { + + } + return (
@@ -43,8 +48,24 @@ const Preview = ({ project, formSchema }) => {
Results
+
+ +
+
+
+ +
+
); } From cc4e7bb98ac1c22d665dd197a1ddd0ce54dd68f6 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Tue, 9 Dec 2025 21:33:13 -0500 Subject: [PATCH 02/15] add new object and add new resource --- .../acme/controller/ScreenerTestResource.java | 29 +++++++++++++++++++ .../org/acme/model/domain/ScreenerTest.java | 27 +++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java create mode 100644 builder-api/src/main/java/org/acme/model/domain/ScreenerTest.java diff --git a/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java b/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java new file mode 100644 index 00000000..fe891150 --- /dev/null +++ b/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java @@ -0,0 +1,29 @@ + +package org.acme.controller; +import org.acme.model.domain.ScreenerTest; + +import io.quarkus.logging.Log; +import io.quarkus.security.identity.SecurityIdentity; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; + +@Path("/api") +public class ScreenerTestResource { + + @PUT + @Consumes + @Path("") + public void testScreener(@Context SecurityIdentity identity, ScreenerTest screenerTest) { + // Write logic here + Log.info(screenerTest); + } + + @GET + @Consumes + @Path("") + public String getScreenerTestResult() { + // Write logic here + return "Empty string"; + } + +} \ No newline at end of file diff --git a/builder-api/src/main/java/org/acme/model/domain/ScreenerTest.java b/builder-api/src/main/java/org/acme/model/domain/ScreenerTest.java new file mode 100644 index 00000000..c0fd5b30 --- /dev/null +++ b/builder-api/src/main/java/org/acme/model/domain/ScreenerTest.java @@ -0,0 +1,27 @@ +package org.acme.model.domain; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import java.util.Map; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class ScreenerTest { + Map inputData; + Map resultData; + + public Map getInputData() { + return inputData; + } + + public void setInputData(Map inputData) { + this.inputData = inputData; + } + + public Map getResultData() { + return resultData; + } + + public void setResultData(Map resultData) { + this.resultData = resultData; + } +} \ No newline at end of file From 3caed17a834cc258efe23122c7ac2c5fd2e6c457 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Mon, 15 Dec 2025 21:22:09 -0500 Subject: [PATCH 03/15] define the endpoint clearer --- .../java/org/acme/controller/ScreenerTestResource.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java b/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java index fe891150..cba9b8e4 100644 --- a/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java +++ b/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java @@ -11,8 +11,7 @@ public class ScreenerTestResource { @PUT - @Consumes - @Path("") + @Path("/screenerTest") public void testScreener(@Context SecurityIdentity identity, ScreenerTest screenerTest) { // Write logic here Log.info(screenerTest); @@ -20,8 +19,8 @@ public void testScreener(@Context SecurityIdentity identity, ScreenerTest screen @GET @Consumes - @Path("") - public String getScreenerTestResult() { + @Path("/screenerTest/{screenerTestId}") + public String getScreenerTestResult(@Context SecurityIdentity identity, @PathParam("screenerTestId") String screenerTestId) { // Write logic here return "Empty string"; } From 1632baf95a9181b3bb40272425b9dd7b78051195 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Mon, 15 Dec 2025 21:23:33 -0500 Subject: [PATCH 04/15] create screener test object, create new container, create new endpoint for endpoint call --- builder-frontend/src/api/screenerTest.ts | 47 +++++++++++++++++++ .../components/project/preview/Preview.tsx | 38 ++++++++------- builder-frontend/src/types.ts | 4 ++ 3 files changed, 71 insertions(+), 18 deletions(-) create mode 100644 builder-frontend/src/api/screenerTest.ts diff --git a/builder-frontend/src/api/screenerTest.ts b/builder-frontend/src/api/screenerTest.ts new file mode 100644 index 00000000..1b306b64 --- /dev/null +++ b/builder-frontend/src/api/screenerTest.ts @@ -0,0 +1,47 @@ +import { authFetch } from "@/api/auth"; + +import type { ScreenerTest } from "@/types"; + +const apiUrl = import.meta.env.VITE_API_URL; + +export const getScreenerTestResult = async (screenerTestId) => { + const url = apiUrl + "/screenerTest/" + screenerTestId; + try { + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); + + if (!response.ok) { + throw new Error(`Fetch failed with status: ${response.status}`); + } + const data = await response.json(); + return data; + } catch (error) { + console.error("Error fetching screener test:", error); + throw error; // rethrow so you can handle it in your component if needed + } +}; + +export const testScreener = async (testScreenerData: ScreenerTest) => { + const url = apiUrl + "/screenerTest"; + try { + const response = await authFetch(url, { + method: "PUT", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + body: JSON.stringify(testScreenerData), + }); + + if (!response.ok) { + throw new Error(`Update failed with status: ${response.status}`); + } + } catch (error) { + console.error("Error updating project:", error); + throw error; + } +}; diff --git a/builder-frontend/src/components/project/preview/Preview.tsx b/builder-frontend/src/components/project/preview/Preview.tsx index adcb9c15..177e0db5 100644 --- a/builder-frontend/src/components/project/preview/Preview.tsx +++ b/builder-frontend/src/components/project/preview/Preview.tsx @@ -6,7 +6,6 @@ import Results from "./Results"; import { evaluateScreener } from "../../../api/screener"; import { PreviewFormData, ScreenerResult } from "./types"; -import { Button } from "solid-bootstrap"; const Preview = ({ project, formSchema }) => { @@ -41,29 +40,32 @@ const Preview = ({ project, formSchema }) => { } return ( + // TODO: Make sure to put container as a row and not columns
Form
-
-
Results
-
- +
+
+
Results
+
+ +
+
- -
-
-
- +
+
+ +
diff --git a/builder-frontend/src/types.ts b/builder-frontend/src/types.ts index eeb98c88..8580e084 100644 --- a/builder-frontend/src/types.ts +++ b/builder-frontend/src/types.ts @@ -95,6 +95,10 @@ export interface DateParameter extends BaseParameter { export interface ScreenerResult { [key: string]: BenefitResult; } +export interface ScreenerTest { + inputData: PublishedScreener + outputData: ScreenerResult +} export interface BenefitResult { name: string; result: OptionalBoolean; From 7ec395f91962f5f836facd8b391a4d50e376816d Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Sun, 11 Jan 2026 17:57:55 -0500 Subject: [PATCH 05/15] change box placement --- .../src/components/project/preview/Preview.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builder-frontend/src/components/project/preview/Preview.tsx b/builder-frontend/src/components/project/preview/Preview.tsx index 177e0db5..10e0a0eb 100644 --- a/builder-frontend/src/components/project/preview/Preview.tsx +++ b/builder-frontend/src/components/project/preview/Preview.tsx @@ -46,22 +46,22 @@ const Preview = ({ project, formSchema }) => {
Form
-
-
-
Results
-
+
+
+
Results
+
-
+
From c90934a2b9cd7e91d6e5da932b3ce1fcb83d1510 Mon Sep 17 00:00:00 2001 From: Michael Dratch Date: Mon, 17 Nov 2025 21:02:00 -0500 Subject: [PATCH 06/15] updated screener evaluation --- .../manageBenefits/configureBenefit/EligibilityCheckListView.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx b/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx index 859272db..fc09feec 100644 --- a/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx +++ b/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx @@ -157,6 +157,7 @@ const EligibilityCheckRow = ({ Add
+ {check.name} {titleCase(check.name)} From 4c9fc347ef990dbdcc364127848fdf35c43abfb6 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Sun, 11 Jan 2026 19:48:55 -0500 Subject: [PATCH 07/15] add new function call to call the api --- .../src/components/project/preview/Preview.tsx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/builder-frontend/src/components/project/preview/Preview.tsx b/builder-frontend/src/components/project/preview/Preview.tsx index 10e0a0eb..473dd106 100644 --- a/builder-frontend/src/components/project/preview/Preview.tsx +++ b/builder-frontend/src/components/project/preview/Preview.tsx @@ -4,6 +4,7 @@ import FormRenderer from "./FormRenderer"; import Results from "./Results"; import { evaluateScreener } from "../../../api/screener"; +import { testScreener, getScreenerTestResult } from "@/api/screenerTest"; import { PreviewFormData, ScreenerResult } from "./types"; @@ -35,8 +36,21 @@ const Preview = ({ project, formSchema }) => { setResultsLoading(false); }; - const handleTest = async () => { + const handleTest = async (screenerTestData) => { + try { + await testScreener(screenerTestData); + } catch (e) { + console.log("Error submitting test screener", e); + } + } + const handleTestResult = async (screenerId) => { + try{ + console.log("Clicked!"); + await getScreenerTestResult(screenerId); + } catch (e) { + console.log("Error getting test screener result", e); + } } return ( @@ -61,7 +75,7 @@ const Preview = ({ project, formSchema }) => {
From 85cfb90a21076feb20dc4783637117ca67bfa46e Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Mon, 19 Jan 2026 00:48:30 -0500 Subject: [PATCH 08/15] remove comment --- builder-frontend/src/components/project/preview/Preview.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/builder-frontend/src/components/project/preview/Preview.tsx b/builder-frontend/src/components/project/preview/Preview.tsx index 473dd106..81364801 100644 --- a/builder-frontend/src/components/project/preview/Preview.tsx +++ b/builder-frontend/src/components/project/preview/Preview.tsx @@ -54,7 +54,6 @@ const Preview = ({ project, formSchema }) => { } return ( - // TODO: Make sure to put container as a row and not columns
Form
From ce55f2de14da9060a35bf0e93389e9e40606d77b Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Mon, 19 Jan 2026 01:05:26 -0500 Subject: [PATCH 09/15] add todo and add logging --- .../main/java/org/acme/controller/ScreenerTestResource.java | 3 ++- builder-frontend/src/api/screenerTest.ts | 1 + builder-frontend/src/components/project/preview/Preview.tsx | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java b/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java index cba9b8e4..4268faca 100644 --- a/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java +++ b/builder-api/src/main/java/org/acme/controller/ScreenerTestResource.java @@ -13,7 +13,8 @@ public class ScreenerTestResource { @PUT @Path("/screenerTest") public void testScreener(@Context SecurityIdentity identity, ScreenerTest screenerTest) { - // Write logic here + + // TODO: WRITE LOGIC HERE Log.info(screenerTest); } diff --git a/builder-frontend/src/api/screenerTest.ts b/builder-frontend/src/api/screenerTest.ts index 1b306b64..3f817a2c 100644 --- a/builder-frontend/src/api/screenerTest.ts +++ b/builder-frontend/src/api/screenerTest.ts @@ -36,6 +36,7 @@ export const testScreener = async (testScreenerData: ScreenerTest) => { }, body: JSON.stringify(testScreenerData), }); + console.log("test inserted(?)"); if (!response.ok) { throw new Error(`Update failed with status: ${response.status}`); diff --git a/builder-frontend/src/components/project/preview/Preview.tsx b/builder-frontend/src/components/project/preview/Preview.tsx index 81364801..e89a8520 100644 --- a/builder-frontend/src/components/project/preview/Preview.tsx +++ b/builder-frontend/src/components/project/preview/Preview.tsx @@ -39,6 +39,7 @@ const Preview = ({ project, formSchema }) => { const handleTest = async (screenerTestData) => { try { await testScreener(screenerTestData); + console.log("Clicked!"); } catch (e) { console.log("Error submitting test screener", e); } From 4cd82d9585f02697796b25feab357c5307273745 Mon Sep 17 00:00:00 2001 From: Michael Dratch Date: Mon, 17 Nov 2025 21:02:00 -0500 Subject: [PATCH 10/15] updated screener evaluation --- .../src/main/java/org/acme/controller/DecisionResource.java | 1 - 1 file changed, 1 deletion(-) diff --git a/builder-api/src/main/java/org/acme/controller/DecisionResource.java b/builder-api/src/main/java/org/acme/controller/DecisionResource.java index 4a2e48d6..d66be409 100644 --- a/builder-api/src/main/java/org/acme/controller/DecisionResource.java +++ b/builder-api/src/main/java/org/acme/controller/DecisionResource.java @@ -12,7 +12,6 @@ import org.acme.enums.EvaluationResult; import org.acme.model.domain.Benefit; import org.acme.model.domain.CheckConfig; -import org.acme.model.domain.EligibilityCheck; import org.acme.model.domain.Screener; import org.acme.model.dto.EvaluateCheckRequest; import org.acme.persistence.EligibilityCheckRepository; From 62c751dff3983d28be0310830e8710deb5cf2b23 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Mon, 15 Dec 2025 21:23:33 -0500 Subject: [PATCH 11/15] create screener test object, create new container, create new endpoint for endpoint call --- builder-frontend/src/components/project/preview/Preview.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/builder-frontend/src/components/project/preview/Preview.tsx b/builder-frontend/src/components/project/preview/Preview.tsx index e89a8520..13c51f8a 100644 --- a/builder-frontend/src/components/project/preview/Preview.tsx +++ b/builder-frontend/src/components/project/preview/Preview.tsx @@ -55,6 +55,7 @@ const Preview = ({ project, formSchema }) => { } return ( + // TODO: Make sure to put container as a row and not columns
Form
From 4f96c0cd3784a65d8fd0faefe2e6602ab0058f9c Mon Sep 17 00:00:00 2001 From: joshwanf <17016446+joshwanf@users.noreply.github.com> Date: Thu, 5 Feb 2026 17:03:45 -0500 Subject: [PATCH 12/15] Revert "Curried authFetch into authGet, authPost, authPut, authDelete, set headers and stringify body in authFetch" This reverts commit 4177d82351f4fac01647798323fc4e2d29b6dd7e. Reverts commits to restore `apiUrl` from env vars used in authFetch --- builder-frontend/src/api/benefit.ts | 23 +++++++++++-- builder-frontend/src/api/check.ts | 28 +++++++++++++--- builder-frontend/src/api/screener.ts | 48 ++++++++++++++++++++++++---- 3 files changed, 86 insertions(+), 13 deletions(-) diff --git a/builder-frontend/src/api/benefit.ts b/builder-frontend/src/api/benefit.ts index f40a4841..a8d7b443 100644 --- a/builder-frontend/src/api/benefit.ts +++ b/builder-frontend/src/api/benefit.ts @@ -11,7 +11,12 @@ export const fetchScreenerBenefit = async ( ): Promise => { const url = apiUrl + "/screener/" + srceenerId + "/benefit/" + benefitId; try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -30,7 +35,14 @@ export const updateScreenerBenefit = async ( ): Promise => { const url = apiUrl + "/screener/" + screenerId + "/benefit"; try { - const response = await authPut(url, benefitData); + const response = await authFetch(url, { + method: "PUT", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + body: JSON.stringify(benefitData), + }); if (!response.ok) { throw new Error(`Update failed with status: ${response.status}`); @@ -46,7 +58,12 @@ export const updateScreenerBenefit = async ( export const fetchPublicBenefits = async (): Promise => { const url = apiUrl + "/benefit"; try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); diff --git a/builder-frontend/src/api/check.ts b/builder-frontend/src/api/check.ts index dfd08c82..2c5c60e3 100644 --- a/builder-frontend/src/api/check.ts +++ b/builder-frontend/src/api/check.ts @@ -13,7 +13,12 @@ const apiUrl = env.apiUrl; export const fetchPublicChecks = async (): Promise => { const url = apiUrl + "/library-checks"; try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -36,7 +41,12 @@ export const fetchCheck = async ( } try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -140,7 +150,12 @@ export const fetchUserDefinedChecks = async ( let url: string = apiUrl + `/custom-checks?working=${workingQueryParam}`; try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -181,7 +196,12 @@ export const getRelatedPublishedChecks = async ( ): Promise => { const url = apiUrl + `/custom-checks/${checkId}/versions`; try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); diff --git a/builder-frontend/src/api/screener.ts b/builder-frontend/src/api/screener.ts index 2fb960a6..c324432d 100644 --- a/builder-frontend/src/api/screener.ts +++ b/builder-frontend/src/api/screener.ts @@ -9,7 +9,12 @@ const apiUrl = env.apiUrl; export const fetchProjects = async () => { const url = apiUrl + "/screeners"; try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -25,7 +30,12 @@ export const fetchProjects = async () => { export const fetchProject = async (screenerId) => { const url = apiUrl + "/screener/" + screenerId; try { - const response = await authGet(url); + const response = await authFetch(url, { + method: "GET", + headers: { + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -79,7 +89,13 @@ export const updateScreener = async ( export const deleteScreener = async (screenerData) => { const url = apiUrl + "/screener/delete?screenerId=" + screenerData.id; try { - const response = await authDelete(url); + const response = await authFetch(url, { + method: "DELETE", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error(`Update failed with status: ${response.status}`); @@ -128,7 +144,14 @@ export const addCustomBenefit = async ( ) => { const url = apiUrl + "/screener/" + screenerId + "/benefit"; try { - const response = await authPost(url, benefit); + const response = await authFetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + body: JSON.stringify(benefit), + }); if (!response.ok) { throw new Error(`Create benefit failed with status: ${response.status}`); @@ -145,7 +168,13 @@ export const removeCustomBenefit = async ( ) => { const url = apiUrl + "/screener/" + screenerId + "/benefit/" + benefitId; try { - const response = await authDelete(url); + const response = await authFetch(url, { + method: "DELETE", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + }); if (!response.ok) { throw new Error( @@ -184,7 +213,14 @@ export const evaluateScreener = async ( ): Promise => { const url = apiUrl + "/decision/v2?screenerId=" + screenerId; try { - const response = await authPost(url, inputData); + const response = await authFetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + body: JSON.stringify(inputData), + }); if (!response.ok) { throw new Error(`Evaluation failed with status: ${response.status}`); From e27332f647f540c9034f838d245b6e44b1f47493 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Sun, 15 Feb 2026 17:06:16 -0500 Subject: [PATCH 13/15] Add back the import --- .../src/main/java/org/acme/controller/DecisionResource.java | 1 + 1 file changed, 1 insertion(+) diff --git a/builder-api/src/main/java/org/acme/controller/DecisionResource.java b/builder-api/src/main/java/org/acme/controller/DecisionResource.java index d66be409..4a2e48d6 100644 --- a/builder-api/src/main/java/org/acme/controller/DecisionResource.java +++ b/builder-api/src/main/java/org/acme/controller/DecisionResource.java @@ -12,6 +12,7 @@ import org.acme.enums.EvaluationResult; import org.acme.model.domain.Benefit; import org.acme.model.domain.CheckConfig; +import org.acme.model.domain.EligibilityCheck; import org.acme.model.domain.Screener; import org.acme.model.dto.EvaluateCheckRequest; import org.acme.persistence.EligibilityCheckRepository; From 211cf7983d98e49ca5a11a76bff6fbf67001cac3 Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Sun, 15 Feb 2026 17:28:01 -0500 Subject: [PATCH 14/15] Revert changes --- builder-frontend/src/api/benefit.ts | 23 ++------- builder-frontend/src/api/check.ts | 28 ++--------- builder-frontend/src/api/screener.ts | 48 +++---------------- .../EligibilityCheckListView.tsx | 1 - 4 files changed, 13 insertions(+), 87 deletions(-) diff --git a/builder-frontend/src/api/benefit.ts b/builder-frontend/src/api/benefit.ts index a8d7b443..b0201cd6 100644 --- a/builder-frontend/src/api/benefit.ts +++ b/builder-frontend/src/api/benefit.ts @@ -11,12 +11,7 @@ export const fetchScreenerBenefit = async ( ): Promise => { const url = apiUrl + "/screener/" + srceenerId + "/benefit/" + benefitId; try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -35,14 +30,7 @@ export const updateScreenerBenefit = async ( ): Promise => { const url = apiUrl + "/screener/" + screenerId + "/benefit"; try { - const response = await authFetch(url, { - method: "PUT", - headers: { - "Content-Type": "application/json", - Accept: "application/json", - }, - body: JSON.stringify(benefitData), - }); + const response = await authPut(url); if (!response.ok) { throw new Error(`Update failed with status: ${response.status}`); @@ -58,12 +46,7 @@ export const updateScreenerBenefit = async ( export const fetchPublicBenefits = async (): Promise => { const url = apiUrl + "/benefit"; try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); diff --git a/builder-frontend/src/api/check.ts b/builder-frontend/src/api/check.ts index 2c5c60e3..dfd08c82 100644 --- a/builder-frontend/src/api/check.ts +++ b/builder-frontend/src/api/check.ts @@ -13,12 +13,7 @@ const apiUrl = env.apiUrl; export const fetchPublicChecks = async (): Promise => { const url = apiUrl + "/library-checks"; try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -41,12 +36,7 @@ export const fetchCheck = async ( } try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -150,12 +140,7 @@ export const fetchUserDefinedChecks = async ( let url: string = apiUrl + `/custom-checks?working=${workingQueryParam}`; try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -196,12 +181,7 @@ export const getRelatedPublishedChecks = async ( ): Promise => { const url = apiUrl + `/custom-checks/${checkId}/versions`; try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); diff --git a/builder-frontend/src/api/screener.ts b/builder-frontend/src/api/screener.ts index c324432d..582cf30c 100644 --- a/builder-frontend/src/api/screener.ts +++ b/builder-frontend/src/api/screener.ts @@ -9,12 +9,7 @@ const apiUrl = env.apiUrl; export const fetchProjects = async () => { const url = apiUrl + "/screeners"; try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -30,12 +25,7 @@ export const fetchProjects = async () => { export const fetchProject = async (screenerId) => { const url = apiUrl + "/screener/" + screenerId; try { - const response = await authFetch(url, { - method: "GET", - headers: { - Accept: "application/json", - }, - }); + const response = await authGet(url); if (!response.ok) { throw new Error(`Fetch failed with status: ${response.status}`); @@ -89,13 +79,7 @@ export const updateScreener = async ( export const deleteScreener = async (screenerData) => { const url = apiUrl + "/screener/delete?screenerId=" + screenerData.id; try { - const response = await authFetch(url, { - method: "DELETE", - headers: { - "Content-Type": "application/json", - Accept: "application/json", - }, - }); + const response = await authDelete(url); if (!response.ok) { throw new Error(`Update failed with status: ${response.status}`); @@ -144,14 +128,7 @@ export const addCustomBenefit = async ( ) => { const url = apiUrl + "/screener/" + screenerId + "/benefit"; try { - const response = await authFetch(url, { - method: "POST", - headers: { - "Content-Type": "application/json", - Accept: "application/json", - }, - body: JSON.stringify(benefit), - }); + const response = await authPost(url); if (!response.ok) { throw new Error(`Create benefit failed with status: ${response.status}`); @@ -168,13 +145,7 @@ export const removeCustomBenefit = async ( ) => { const url = apiUrl + "/screener/" + screenerId + "/benefit/" + benefitId; try { - const response = await authFetch(url, { - method: "DELETE", - headers: { - "Content-Type": "application/json", - Accept: "application/json", - }, - }); + const response = await authDelete(url); if (!response.ok) { throw new Error( @@ -213,14 +184,7 @@ export const evaluateScreener = async ( ): Promise => { const url = apiUrl + "/decision/v2?screenerId=" + screenerId; try { - const response = await authFetch(url, { - method: "POST", - headers: { - "Content-Type": "application/json", - Accept: "application/json", - }, - body: JSON.stringify(inputData), - }); + const response = await authPost(url); if (!response.ok) { throw new Error(`Evaluation failed with status: ${response.status}`); diff --git a/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx b/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx index fc09feec..859272db 100644 --- a/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx +++ b/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx @@ -157,7 +157,6 @@ const EligibilityCheckRow = ({ Add
- {check.name} {titleCase(check.name)} From a560fd0d9a3ea57f62231e2d4ec7f820dac9e2ba Mon Sep 17 00:00:00 2001 From: Rafael Perez Date: Sun, 15 Feb 2026 17:32:24 -0500 Subject: [PATCH 15/15] Revert Part Two: Add arguments in which it was missing from last commit --- builder-frontend/src/api/benefit.ts | 2 +- builder-frontend/src/api/screener.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder-frontend/src/api/benefit.ts b/builder-frontend/src/api/benefit.ts index b0201cd6..f40a4841 100644 --- a/builder-frontend/src/api/benefit.ts +++ b/builder-frontend/src/api/benefit.ts @@ -30,7 +30,7 @@ export const updateScreenerBenefit = async ( ): Promise => { const url = apiUrl + "/screener/" + screenerId + "/benefit"; try { - const response = await authPut(url); + const response = await authPut(url, benefitData); if (!response.ok) { throw new Error(`Update failed with status: ${response.status}`); diff --git a/builder-frontend/src/api/screener.ts b/builder-frontend/src/api/screener.ts index 582cf30c..2fb960a6 100644 --- a/builder-frontend/src/api/screener.ts +++ b/builder-frontend/src/api/screener.ts @@ -128,7 +128,7 @@ export const addCustomBenefit = async ( ) => { const url = apiUrl + "/screener/" + screenerId + "/benefit"; try { - const response = await authPost(url); + const response = await authPost(url, benefit); if (!response.ok) { throw new Error(`Create benefit failed with status: ${response.status}`); @@ -184,7 +184,7 @@ export const evaluateScreener = async ( ): Promise => { const url = apiUrl + "/decision/v2?screenerId=" + screenerId; try { - const response = await authPost(url); + const response = await authPost(url, inputData); if (!response.ok) { throw new Error(`Evaluation failed with status: ${response.status}`);