Merge pull request #192 from mikepsinn/develop

Better handling of dFDA get responses
curedao · Apr 28, 2024 · 72b4d62 · 72b4d62
2 parents e28517f + ccc538b
commit 72b4d62
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/apps/nextjs/app/api/dfda/[dfdaPath]/route.ts b/apps/nextjs/app/api/dfda/[dfdaPath]/route.ts
@@ -16,7 +16,9 @@ export async function GET(req: Request, context: z.infer<typeof routeContextSche
   const urlParams = Object.fromEntries(new URL(req.url).searchParams);
   const session = await getServerSession(authOptions);
   try {
-    return dfdaGET(params.dfdaPath, urlParams, session?.user.id);
+    const response = await dfdaGET(params.dfdaPath, urlParams, session?.user.id);
+    const data = response.data ?? response;
+    return new Response(JSON.stringify(data), { status: 200, headers: { 'Content-Type': 'application/json' } });
   } catch (error) {
     return handleError(error);
   }
@@ -28,7 +30,9 @@ export async function POST(req: Request, context: z.infer<typeof routeContextSch
   const body = await req.json();
   const session = await getServerSession(authOptions);
   try {
-    return dfdaPOST(params.dfdaPath, body, session?.user.id, urlParams);
+    const response = await dfdaPOST(params.dfdaPath, body, session?.user.id, urlParams);
+    const data = response.data ?? response;
+    return new Response(JSON.stringify(data), { status: response.status, headers: { 'Content-Type': 'application/json' } });
   } catch (error) {
     return handleError(error);
   }

diff --git a/apps/nextjs/components/userVariable/measurement-button.tsx b/apps/nextjs/components/userVariable/measurement-button.tsx
@@ -20,9 +20,6 @@ interface MeasurementButtonProps extends ButtonProps {
     "combinationOperation" | "unitAbbreviatedName" | "variableCategoryName" |
     "lastValue" | "unitName" | "userId" | "variableId"
   >
-  className: string;
-  size: string;
-  variant: string;
 }
 
 export function MeasurementButton({ userVariable, ...props }: MeasurementButtonProps) {
@@ -35,13 +32,10 @@ export function MeasurementButton({ userVariable, ...props }: MeasurementButtonP
     //router.refresh();
   }
 
-  // Destructure `ref` and `size` out of props to avoid passing it to the Button component if not valid
-  const { ref, size, ...buttonProps } = props;
-
 
   return (
     <>
-      <Button onClick={onClick} {...buttonProps} size={"default"} variant={"default"}>
+      <Button onClick={onClick}  {...props}>
         <Icons.add className="h-4 w-4" />
       </Button>
       {isFormOpen && (

diff --git a/apps/nextjs/components/userVariable/user-variable-item.tsx b/apps/nextjs/components/userVariable/user-variable-item.tsx
@@ -48,12 +48,12 @@ export function UserVariableItem({ userVariable }: UserVariableItemProps) {
           variant="outline"
           size="icon"
         />
-{/*        <QuickMeasurementButton
+        <QuickMeasurementButton
           userVariable={userVariable}
           className="flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted"
           variant="outline"
           size="icon"
-        />*/}
+        />
         <Link
           href={`/dashboard/userVariables/${userVariable.variableId}`}
           className="flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted"