Merge branch 'develop' into search-ui-for-discharge-patients

ohcnetwork · Dec 12, 2024 · bc539f8 · bc539f8
2 parents 2152169 + ead041b
commit bc539f8
Show file tree

Hide file tree

Showing 129 changed files with 1,418 additions and 1,082 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,14 +60,16 @@
     "@pnotify/mobile": "^5.2.0",
     "@radix-ui/react-dialog": "^1.1.2",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
+    "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.2",
     "@radix-ui/react-scroll-area": "^1.2.0",
-    "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-toast": "^1.2.2",
     "@radix-ui/react-tooltip": "^1.1.4",
     "@sentry/browser": "^8.42.0",
+    "@tanstack/react-query": "^5.62.3",
+    "@tanstack/react-query-devtools": "^5.62.7",
     "@yudiel/react-qr-scanner": "^2.0.8",
     "bowser": "^2.11.0",
     "browser-image-compression": "^2.0.2",

diff --git a/public/locale/en.json b/public/locale/en.json
@@ -794,6 +794,7 @@
   "get_tests": "Get Tests",
   "goal": "Our goal is to continuously improve the quality and accessibility of public healthcare services using digital tools.",
   "granted_on": "Granted On",
+  "has_allergies": "Has Allergies",
   "has_domestic_healthcare_support": "Has domestic healthcare support?",
   "has_sari": "Has SARI (Severe Acute Respiratory illness)?",
   "health-profile": "Health Profile",

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,3 +1,5 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { Suspense } from "react";
 
 import { Toaster } from "@/components/ui/toaster";
@@ -13,26 +15,41 @@ import { FeatureFlagsProvider } from "@/Utils/featureFlags";
 
 import { PubSubProvider } from "./Utils/pubsubContext";
 
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: 3,
+      refetchOnWindowFocus: false,
+      staleTime: 5 * 60 * 1000, // 5 minutes
+    },
+  },
+});
+
 const App = () => {
   return (
-    <Suspense fallback={<Loading />}>
-      <PubSubProvider>
-        <PluginEngine>
-          <HistoryAPIProvider>
-            <AuthUserProvider unauthorized={<Routers.SessionRouter />}>
-              <FeatureFlagsProvider>
-                <Routers.AppRouter />
-              </FeatureFlagsProvider>
-            </AuthUserProvider>
-
-            {/* Integrations */}
-            <Integrations.Sentry disabled={!import.meta.env.PROD} />
-            <Integrations.Plausible />
-          </HistoryAPIProvider>
-          <Toaster />
-        </PluginEngine>
-      </PubSubProvider>
-    </Suspense>
+    <QueryClientProvider client={queryClient}>
+      <Suspense fallback={<Loading />}>
+        <PubSubProvider>
+          <PluginEngine>
+            <HistoryAPIProvider>
+              <AuthUserProvider unauthorized={<Routers.SessionRouter />}>
+                <FeatureFlagsProvider>
+                  <Routers.AppRouter />
+                </FeatureFlagsProvider>
+              </AuthUserProvider>
+
+              {/* Integrations */}
+              <Integrations.Sentry disabled={!import.meta.env.PROD} />
+              <Integrations.Plausible />
+            </HistoryAPIProvider>
+            <Toaster />
+          </PluginEngine>
+        </PubSubProvider>
+      </Suspense>
+
+      {/* Devtools are not included in production builds by default */}
+      <ReactQueryDevtools initialIsOpen={false} />
+    </QueryClientProvider>
   );
 };
 

diff --git a/src/CAREUI/misc/PaginatedList.tsx b/src/CAREUI/misc/PaginatedList.tsx
@@ -6,13 +6,15 @@ import ButtonV2, { CommonButtonProps } from "@/components/Common/ButtonV2";
 import Pagination from "@/components/Common/Pagination";
 
 import { PaginatedResponse, QueryRoute } from "@/Utils/request/types";
-import useQuery, { QueryOptions } from "@/Utils/request/useQuery";
+import useTanStackQueryInstead, {
+  QueryOptions,
+} from "@/Utils/request/useQuery";
 import { classNames } from "@/Utils/utils";
 
 const DEFAULT_PER_PAGE_LIMIT = 14;
 
 interface PaginatedListContext<TItem>
-  extends ReturnType<typeof useQuery<PaginatedResponse<TItem>>> {
+  extends ReturnType<typeof useTanStackQueryInstead<PaginatedResponse<TItem>>> {
   items: TItem[];
   perPage: number;
   currentPage: number;
@@ -37,11 +39,11 @@ interface Props<TItem> extends QueryOptions<PaginatedResponse<TItem>> {
   initialPage?: number;
   onPageChange?: (page: number) => void;
   queryCB?: (
-    query: ReturnType<typeof useQuery<PaginatedResponse<TItem>>>,
+    query: ReturnType<typeof useTanStackQueryInstead<PaginatedResponse<TItem>>>,
   ) => void;
   children: (
     ctx: PaginatedListContext<TItem>,
-    query: ReturnType<typeof useQuery<PaginatedResponse<TItem>>>,
+    query: ReturnType<typeof useTanStackQueryInstead<PaginatedResponse<TItem>>>,
   ) => JSX.Element | JSX.Element[];
 }
 
@@ -59,7 +61,7 @@ export default function PaginatedList<TItem extends object>({
     queryOptions.onPageChange?.(page);
   };
 
-  const query = useQuery(route, {
+  const query = useTanStackQueryInstead(route, {
     ...queryOptions,
     query: {
       ...queryOptions.query,

diff --git a/src/Providers/AuthUserProvider.tsx b/src/Providers/AuthUserProvider.tsx
@@ -10,7 +10,7 @@ import { LocalStorageKeys } from "@/common/constants";
 
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
-import useQuery from "@/Utils/request/useQuery";
+import useTanStackQueryInstead from "@/Utils/request/useQuery";
 
 interface Props {
   children: React.ReactNode;
@@ -23,7 +23,7 @@ export default function AuthUserProvider({ children, unauthorized }: Props) {
     data: user,
     loading,
     refetch,
-  } = useQuery(routes.currentUser, { silent: true });
+  } = useTanStackQueryInstead(routes.currentUser, { silent: true });
 
   useEffect(() => {
     if (!user) {

diff --git a/src/Utils/featureFlags.tsx b/src/Utils/featureFlags.tsx
@@ -5,7 +5,7 @@ import { FacilityModel } from "@/components/Facility/models";
 import useAuthUser from "@/hooks/useAuthUser";
 
 import routes from "@/Utils/request/api";
-import useQuery from "@/Utils/request/useQuery";
+import useTanStackQueryInstead from "@/Utils/request/useQuery";
 
 export type FeatureFlag = "SCRIBE_ENABLED"; // "HCX_ENABLED" | "ABDM_ENABLED" |
 
@@ -60,7 +60,7 @@ export const useFeatureFlags = (facility?: FacilityModel | string) => {
     );
   }
 
-  const facilityQuery = useQuery(routes.getPermittedFacility, {
+  const facilityQuery = useTanStackQueryInstead(routes.getPermittedFacility, {
     pathParams: {
       id: typeof facility === "string" ? facility : "",
     },