discard changes in userAutoComp and rm FacilityId

src/components/Common/UserAutocompleteFormField.tsx

@@ -1,4 +1,3 @@
-import { useQuery } from "@tanstack/react-query";
 import { useEffect, useState } from "react";
 
 import { Autocomplete } from "@/components/Form/FormFields/Autocomplete";
@@ -11,7 +10,7 @@ import { UserType } from "@/components/Users/UserFormValidations";
 import { UserBareMinimum } from "@/components/Users/models";
 
 import routes from "@/Utils/request/api";
-import query from "@/Utils/request/query";
+import useTanStackQueryInstead from "@/Utils/request/useQuery";
 import {
   classNames,
   formatName,
@@ -34,38 +33,35 @@ type UserSearchProps = BaseProps & {
 
 export default function UserAutocomplete(props: UserSearchProps) {
   const field = useFormFieldPropsResolver(props);
-  const [queryParam, setQueryParam] = useState("");
+  const [query, setQuery] = useState("");
   const [disabled, setDisabled] = useState(false);
 
-  const { data, isLoading } = useQuery({
-    queryKey: ["user", props.homeFacility, props.facilityId],
-    queryFn: query(routes.userList, {
-      queryParams: {
-        home_facility: props.homeFacility,
-        user_type: props.userType,
-        search_text: queryParam,
-        limit: 50,
-        offset: 0,
-      },
-    }),
+  const { data, loading } = useTanStackQueryInstead(routes.userList, {
+    query: {
+      home_facility: props.homeFacility,
+      user_type: props.userType,
+      search_text: query,
+      limit: 50,
+      offset: 0,
+    },
   });
 
   useEffect(() => {
     if (
-      isLoading ||
-      queryParam ||
+      loading ||
+      query ||
       !field.required ||
       !props.noResultsError ||
-      !data
+      !data?.results
     ) {
       return;
     }
 
-    if (data.count === 0) {
+    if (data.results.length === 0) {
       setDisabled(true);
       field.handleChange(undefined as unknown as UserBareMinimum);
     }
-  }, [isLoading, field.required, data?.results, props.noResultsError]);
+  }, [loading, field.required, data?.results, props.noResultsError]);
 
   const getAvatar = (option: UserBareMinimum) => {
     return (
@@ -98,8 +94,8 @@ export default function UserAutocomplete(props: UserSearchProps) {
           `${option.user_type} - ${option.username}`
         }
         optionValue={(option) => option}
-        onQuery={setQueryParam}
-        isLoading={isLoading}
+        onQuery={setQuery}
+        isLoading={loading}
       />
     </FormField>
   );

src/components/Patient/FileUploadPage.tsx

@@ -15,7 +15,7 @@ export default function FileUploadPage(props: {
   const { facilityId, patientId, encounterId, type } = props;
 
   const { data: patient } = useQuery({
-    queryKey: ["patient", facilityId, patientId],
+    queryKey: ["patient", patientId],
     queryFn: query(routes.getPatient, {
       pathParams: { id: patientId },
     }),