[FIX] Query key in useInvalidateQueries

packages/react-query/src/index.ts

@@ -209,13 +209,52 @@ export type QueryClient<TApiRouter extends FlatApiRouter> =
       }
     : never
 
+function isEmptyObject(obj: any): boolean {
+  return (
+    obj != null && typeof obj === 'object' && !Array.isArray(obj) && Object.keys(obj).length === 0
+  )
+}
+
+function sortObjectDeep(obj: any): any {
+  if (obj == null || typeof obj !== 'object' || Array.isArray(obj)) {
+    return obj
+  }
+
+  return Object.keys(obj)
+    .sort()
+    .reduce((result, key) => {
+      result[key] = sortObjectDeep(obj[key])
+      return result
+    }, {} as any)
+}
+
+function normalizePayload(payload?: any): any {
+  if (!payload) return undefined
+
+  const normalized = {
+    pathParams: payload.pathParams,
+    query: payload.query,
+    headers: payload.headers,
+  }
+
+  const filtered = Object.entries(normalized).reduce((acc, [key, value]) => {
+    if (value != null && !isEmptyObject(value)) {
+      acc[key] = sortObjectDeep(value)
+    }
+    return acc
+  }, {} as any)
+
+  return Object.keys(filtered).length > 0 ? filtered : undefined
+}
+
 export function queryKey(method: string, path: string | number | symbol, payload?: any) {
-  const payloadKey = {
-    pathParams: payload?.pathParams ?? {},
-    query: payload?.query ?? {},
-    headers: payload?.headers ?? {},
+  const normalizedPayload = normalizePayload(payload)
+
+  if (normalizedPayload) {
+    return [method, path, normalizedPayload] as const
   }
-  return [method, path, payloadKey] as const
+
+  return [method, path] as const
 }
 
 export function createQueryClient<TApp extends GensekiAppCompiled>(

packages/react/src/react/views/collections/list/context.tsx

@@ -81,10 +81,9 @@ function _CollectionListProvider<T extends BaseData>(props: CollectionListProvid
   const queryClient = useQueryClient()
   const query = useCollectionListQuery({ slug: context.slug })
 
-  const invalidateList = async (page?: number) => {
-    const additionalKeys = page ? [{ query: { page } }] : []
+  const invalidateList = async () => {
     await queryClient.invalidateQueries({
-      queryKey: ['GET', `/${context.slug}`, ...additionalKeys],
+      queryKey: query.queryKey,
       exact: false,
     })
   }

packages/react/src/react/views/collections/list/hooks/use-collection-list.ts

@@ -20,9 +20,10 @@ export function useCollectionListQuery(
     search: args.search ?? search,
     sort: sort,
   }
+  const fullQueryKey = ['GET', `/${args.slug}`, { query: queryKey }] as const
 
   const query: UseQueryResult<CollectionListResponse> = useQuery({
-    queryKey: ['GET', `/${args.slug}`, { query: queryKey }] as const,
+    queryKey: fullQueryKey,
     queryFn: async (context) => {
       const [, , payload] = context.queryKey
       const params = new URLSearchParams([
@@ -50,5 +51,5 @@ export function useCollectionListQuery(
     placeholderData: keepPreviousData,
   })
 
-  return query
+  return { ...query, queryKey: fullQueryKey }
 }