Remove useQuery override

Author: jonkafton

frontends/api/src/hooks/channels/index.ts

@@ -1,9 +1,9 @@
 import {
+  useQuery,
   UseQueryOptions,
   useMutation,
   useQueryClient,
 } from "@tanstack/react-query"
-import { useQuery } from "../../ssr/useQuery"
 import { channelsApi } from "../../clients"
 import type {
   ChannelsApiChannelsListRequest,

frontends/api/src/hooks/learningResources/index.ts

@@ -1,10 +1,10 @@
 import {
   UseQueryOptions,
+  useQuery,
   useInfiniteQuery,
   useMutation,
   useQueryClient,
 } from "@tanstack/react-query"
-import { useQuery } from "../../ssr/useQuery"
 import {
   learningpathsApi,
   learningResourcesApi,

frontends/api/src/hooks/newsEvents/index.ts

@@ -1,4 +1,4 @@
-import { useQuery } from "../../ssr/useQuery"
+import { useQuery } from "@tanstack/react-query"
 import newsEvents from "./keyFactory"
 import {
   NewsEventsApiNewsEventsListRequest,

frontends/api/src/hooks/programLetters/index.ts

@@ -1,4 +1,4 @@
-import { useQuery } from "../../ssr/useQuery"
+import { useQuery } from "@tanstack/react-query"
 import programLetters from "./keyFactory"
 
 /**

frontends/api/src/hooks/searchSubscription/index.ts

@@ -2,8 +2,8 @@ import {
   useMutation,
   UseQueryOptions,
   useQueryClient,
+  useQuery,
 } from "@tanstack/react-query"
-import { useQuery } from "../../ssr/useQuery"
 import searchSubscriptions from "./keyFactory"
 import type { LearningResourcesUserSubscriptionApiLearningResourcesUserSubscriptionSubscribeCreateRequest as subscriptionCreateRequest } from "../../generated/v1"
 import { searchSubscriptionApi } from "../../clients"

frontends/api/src/hooks/testimonials/index.ts

@@ -1,5 +1,4 @@
-import { UseQueryOptions } from "@tanstack/react-query"
-import { useQuery } from "../../ssr/useQuery"
+import { UseQueryOptions, useQuery } from "@tanstack/react-query"
 
 import type { TestimonialsApiTestimonialsListRequest } from "../../generated/v0"
 import testimonials from "./keyFactory"

frontends/api/src/hooks/widget_lists/index.ts

@@ -1,5 +1,4 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query"
-import { useQuery } from "../../ssr/useQuery"
+import { useMutation, useQueryClient, useQuery } from "@tanstack/react-query"
 
 import { widgetListsApi } from "../../clients"
 import widgetLists from "./keyFactory"

frontends/api/src/ssr/prefetch.ts

@@ -1,26 +1,13 @@
 import { QueryClient, dehydrate } from "@tanstack/react-query"
-import type { QueryKey, QueryFunction } from "@tanstack/react-query"
+import type { Query } from "@tanstack/react-query"
 
-type Query = {
-  queryKey: QueryKey
-  queryFn: QueryFunction
-}
-
-// TODO fix unknown type
+// Utility to avoid repetition in server components
 export const prefetch = async (queries: (Query | unknown)[]) => {
   const queryClient = new QueryClient()
 
   await Promise.all(
     queries.map((query) => queryClient.prefetchQuery(query as Query)),
   )
 
-  const prefetchedKeys = queryClient
-    .getQueriesData([])
-    .map((item) => JSON.stringify(item[0]))
-
-  /* Set the prefetched keys so we can check them after first
-   * render to make sure we are not prefetching anything unnecessarily */
-  queryClient.setQueryData(["prefetchedKeys"], prefetchedKeys)
-
   return dehydrate(queryClient)
 }

frontends/api/src/ssr/useQuery.tsx

@@ -14,7 +14,6 @@ export const metadata: Metadata = standardizeMetadata({
 const Page: React.FC = async () => {
   const dehydratedState = await prefetch([
     channelsKeyFactory.countsByType("department"),
-    channelsKeyFactory.countsByType("maybe"),
     learningResourcesKeyFactory.schools(),
   ])
 

frontends/main/src/app/departments/page.tsx

@@ -6,14 +6,12 @@ import { QueryClientProvider } from "@tanstack/react-query"
 import { ThemeProvider, NextJsAppRouterCacheProvider } from "ol-components"
 import { Provider as NiceModalProvider } from "@ebay/nice-modal-react"
 import ConfiguredPostHogProvider from "@/components/ConfiguredPostHogProvider/ConfiguredPostHogProvider"
-// import { useQueryCacheWarning } from "api/ssr/useQueryCacheWarning"
-import { useMissingPrefetchWarning } from "api/ssr/useMissingPrefetchWarning"
+import { usePrefetchWarnings } from "api/ssr/usePrefetchWarnings"
 
 export default function Providers({ children }: { children: React.ReactNode }) {
   const queryClient = getQueryClient()
 
-  // useQueryCacheWarning(queryClient)
-  useMissingPrefetchWarning(queryClient)
+  usePrefetchWarnings(queryClient)
 
   return (
     <ConfiguredPostHogProvider>