move chat querykeys

web/src/api/buster_rest/chats/queryRequests.ts

@@ -2,15 +2,17 @@ import { useCreateReactQuery } from '@/api/createReactQuery';
 import { useMemoizedFn } from 'ahooks';
 import { QueryClient } from '@tanstack/react-query';
 import { getListChats, getListChats_server, getChat, getChat_server } from './requests';
-import type { BusterChatListItem, BusterChat } from '@/api/asset_interfaces';
+import type { BusterChatListItem } from '@/api/asset_interfaces';
+import { queryKeys } from '@/api/query_keys';
+import { updateChatToIChat } from '@/utils/chat';
 
 export const useGetListChats = (params?: Parameters<typeof getListChats>[0]) => {
-  const queryFn = useMemoizedFn(() => {
+  const queryFn = useMemoizedFn((): Promise<BusterChatListItem[]> => {
     return getListChats(params);
   });
 
-  const res = useCreateReactQuery<BusterChatListItem[]>({
+  const res = useCreateReactQuery({
-    queryKey: ['chats', 'list', params || {}],
+    ...queryKeys.chatsGetList(params),
     queryFn
   });
 
@@ -27,7 +29,7 @@ export const prefetchGetListChats = async (
   const queryClient = queryClientProp || new QueryClient();
 
   await queryClient.prefetchQuery({
-    queryKey: ['chats', 'list', params || {}],
+    ...queryKeys.chatsGetList(params),
     queryFn: () => getListChats_server(params)
   });
 
@@ -35,13 +37,16 @@ export const prefetchGetListChats = async (
 };
 
 export const useGetChat = (params: Parameters<typeof getChat>[0]) => {
-  const queryFn = useMemoizedFn(() => {
+  const queryFn = useMemoizedFn(async () => {
-    return getChat(params);
+    const chat = await getChat(params);
+    const iChat = updateChatToIChat(chat, true).iChat;
+    return iChat;
   });
 
-  return useCreateReactQuery<BusterChat>({
+  return useCreateReactQuery({
-    queryKey: ['chats', 'get', params.id],
+    ...queryKeys.chatsGetChat(params.id),
-    queryFn
+    queryFn,
+    enabled: true
   });
 };
 
@@ -52,8 +57,12 @@ export const prefetchGetChat = async (
   const queryClient = queryClientProp || new QueryClient();
 
   await queryClient.prefetchQuery({
-    queryKey: ['chats', 'get', params.id],
+    ...queryKeys.chatsGetChat(params.id),
-    queryFn: () => getChat_server(params)
+    queryFn: async () => {
+      const chat = await getChat_server(params);
+      const iChat = updateChatToIChat(chat, true).iChat;
+      return iChat;
+    }
   });
 
   return queryClient;

web/src/api/createReactQuery.ts

@@ -15,46 +15,30 @@ import { useBusterNotifications } from '@/context/BusterNotifications';
 import { RustApiError } from './buster_rest/errors';
 import { useMemoizedFn } from 'ahooks';
 
-interface CreateQueryProps<TData, TError = unknown> {
+type CreateQueryProps<TData = unknown, TError = unknown> = UseQueryOptions<TData, TError, TData> & {
-  queryKey: QueryKey;
-  queryFn: () => Promise<TData>;
-  isUseSession?: boolean;
   useErrorNotification?: boolean;
-  enabled?: boolean;
+  isUseSession?: boolean;
-  initialData?: TData;
+};
-  refetchOnWindowFocus?: boolean;
-  refetchOnMount?: boolean;
-  staleTime?: number;
-  options?: Omit<UseQueryOptions<TData, TError, TData>, 'queryKey' | 'queryFn'>;
-}
 
 export const PREFETCH_STALE_TIME = 1000 * 10;
 
-export const useCreateReactQuery = <TData, TError = unknown>({
+export const useCreateReactQuery = <TData = unknown, TError = unknown>({
-  queryKey,
-  queryFn,
   isUseSession = true,
   enabled = true,
-  initialData,
   refetchOnWindowFocus = false,
   refetchOnMount = true,
   useErrorNotification = true,
-  staleTime,
+  ...options
-  options = {}
 }: CreateQueryProps<TData, TError>) => {
   const { openErrorNotification } = useBusterNotifications();
   const accessToken = useSupabaseContext((state) => state.accessToken);
   const baseEnabled = isUseSession ? !!accessToken : true;
 
-  const q = useQuery<TData, TError>({
+  const q = useQuery({
-    queryKey: queryKey,
-    queryFn,
     enabled: baseEnabled && !!enabled,
-    initialData,
     retry: 0,
     refetchOnWindowFocus,
     refetchOnMount,
-    staleTime,
     ...options
   });