refactor: modified error message

noufalrahim · Dec 14, 2024 · c55af60 · c55af60
1 parent c8963ad
commit c55af60
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/src/Utils/request/request.ts b/src/Utils/request/request.ts
@@ -18,6 +18,10 @@ export default async function request<TData, TBody>(
     silent,
     signal,
   }: Options<TData, TBody> = {},
+  errorObj?: {
+    code: string;
+    detail: string;
+  },
 ): Promise<RequestResult<TData>> {
   const url = `${careConfig.apiUrl}${makeUrl(path, query, pathParams)}`;
 
@@ -43,7 +47,11 @@ export default async function request<TData, TBody>(
     result = {
       res,
       data: res.ok ? data : undefined,
-      error: res.ok ? undefined : (data as Record<string, unknown>),
+      error: res.ok
+        ? undefined
+        : errorObj
+          ? errorObj
+          : (data as Record<string, unknown>),
     };
 
     onResponse?.(result);

diff --git a/src/Utils/request/useQuery.ts b/src/Utils/request/useQuery.ts
@@ -17,6 +17,10 @@ export interface QueryOptions<TData> extends RequestOptions<TData> {
 export default function useTanStackQueryInstead<TData>(
   route: QueryRoute<TData>,
   options?: QueryOptions<TData>,
+  errorObj?: {
+    code: string;
+    detail: string;
+  },
 ) {
   const overridesRef = useRef<QueryOptions<TData>>();
 
@@ -35,7 +39,7 @@ export default function useTanStackQueryInstead<TData>(
         ? mergeRequestOptions(options || {}, overridesRef.current)
         : options;
 
-      return await request(route, { ...resolvedOptions, signal });
+      return await request(route, { ...resolvedOptions, signal }, errorObj);
     },
     enabled: options?.prefetch ?? true,
     refetchOnWindowFocus: false,

diff --git a/src/components/Facility/DischargeModal.tsx b/src/components/Facility/DischargeModal.tsx
@@ -92,10 +92,17 @@ const DischargeModal = ({
     setFacility(referred_to);
   }, [referred_to]);
 
-  const initialDiagnoses = useTanStackQueryInstead(routes.getConsultation, {
-    pathParams: { id: consultationData.id ?? "" },
-    prefetch: !!consultationData.id,
-  }).data?.diagnoses;
+  const initialDiagnoses = useTanStackQueryInstead(
+    routes.getConsultation,
+    {
+      pathParams: { id: consultationData.id ?? "" },
+      prefetch: !!consultationData.id,
+    },
+    {
+      code: "",
+      detail: t("consultation_missing_warning"),
+    },
+  ).data?.diagnoses;
 
   const discharge_reason =
     new_discharge_reason ?? preDischargeForm.new_discharge_reason;