Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix query params imports

This commit is contained in:
Nate Kelley 2025-07-04 00:25:22 -06:00
parent fb573f042c
commit 18febf7428
No known key found for this signature in database
GPG Key ID: FD90372AB8D98B4F
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/web/src/api/buster_rest/users/queryRequests.ts
View File

@ -1,7 +1,7 @@
import { QueryClient, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { QueryClient, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { queryKeys } from '@/api/query_keys'; import { userQueryKeys } from '@/api/query_keys/users';
import { useMemoizedFn } from '@/hooks'; import { useMemoizedFn } from '@/hooks';
import { useCreateOrganization } from '../organizations'; import { useCreateOrganization } from '../organizations/queryRequests';
import { import {
getMyUserInfo, getMyUserInfo,
getMyUserInfo_server, getMyUserInfo_server,
@ -15,7 +15,7 @@ import {
export const useGetMyUserInfo = () => { export const useGetMyUserInfo = () => {
return useQuery({ return useQuery({
...queryKeys.userGetUserMyself, ...userQueryKeys.userGetUserMyself,
queryFn: getMyUserInfo, queryFn: getMyUserInfo,
enabled: false //This is a server only query enabled: false //This is a server only query
}); });
@ -27,7 +27,7 @@ export const prefetchGetMyUserInfo = async (
) => { ) => {
const queryClient = queryClientProp || new QueryClient(); const queryClient = queryClientProp || new QueryClient();
await queryClient.prefetchQuery({ await queryClient.prefetchQuery({
...queryKeys.userGetUserMyself, ...userQueryKeys.userGetUserMyself,
queryFn: () => getMyUserInfo_server(params) queryFn: () => getMyUserInfo_server(params)
}); });
return queryClient; return queryClient;
@ -36,7 +36,7 @@ export const prefetchGetMyUserInfo = async (
export const useGetUser = (params: Parameters<typeof getUser>[0]) => { export const useGetUser = (params: Parameters<typeof getUser>[0]) => {
const queryFn = useMemoizedFn(() => getUser(params)); const queryFn = useMemoizedFn(() => getUser(params));
return useQuery({ return useQuery({
...queryKeys.userGetUser(params.userId), ...userQueryKeys.userGetUser(params.userId),
queryFn queryFn
}); });
}; };
@ -44,7 +44,7 @@ export const useGetUser = (params: Parameters<typeof getUser>[0]) => {
export const useUpdateUser = () => { export const useUpdateUser = () => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const mutationFn = useMemoizedFn(async (params: Parameters<typeof updateOrganizationUser>[0]) => { const mutationFn = useMemoizedFn(async (params: Parameters<typeof updateOrganizationUser>[0]) => {
const options = queryKeys.userGetUser(params.userId); const options = userQueryKeys.userGetUser(params.userId);
queryClient.setQueryData(options.queryKey, (oldData) => { queryClient.setQueryData(options.queryKey, (oldData) => {
if (!oldData) return oldData; if (!oldData) return oldData;
return { return {
@ -64,7 +64,7 @@ export const useUpdateUser = () => {
export const prefetchGetUser = async (userId: string, queryClientProp?: QueryClient) => { export const prefetchGetUser = async (userId: string, queryClientProp?: QueryClient) => {
const queryClient = queryClientProp || new QueryClient(); const queryClient = queryClientProp || new QueryClient();
await queryClient.prefetchQuery({ await queryClient.prefetchQuery({
...queryKeys.userGetUser(userId), ...userQueryKeys.userGetUser(userId),
queryFn: () => getUser_server({ userId }) queryFn: () => getUser_server({ userId })
}); });
return queryClient; return queryClient;
@ -74,7 +74,7 @@ export const useGetUserList = (params: Parameters<typeof getUserList>[0]) => {
const queryFn = useMemoizedFn(() => getUserList(params)); const queryFn = useMemoizedFn(() => getUserList(params));
return useQuery({ return useQuery({
...queryKeys.userGetUserList(params), ...userQueryKeys.userGetUserList(params),
queryFn queryFn
}); });
}; };
@ -85,7 +85,7 @@ export const prefetchGetUserList = async (
) => { ) => {
const queryClient = queryClientProp || new QueryClient(); const queryClient = queryClientProp || new QueryClient();
await queryClient.prefetchQuery({ await queryClient.prefetchQuery({
...queryKeys.userGetUserList(params), ...userQueryKeys.userGetUserList(params),
queryFn: () => getUserList_server(params) queryFn: () => getUserList_server(params)
}); });
return queryClient; return queryClient;
@ -97,11 +97,11 @@ export const useInviteUser = () => {
return useMutation({ return useMutation({
mutationFn: inviteUser, mutationFn: inviteUser,
onSuccess: () => { onSuccess: () => {
const user = queryClient.getQueryData(queryKeys.userGetUserMyself.queryKey); const user = queryClient.getQueryData(userQueryKeys.userGetUserMyself.queryKey);
const teamId = user?.organizations?.[0]?.id; const teamId = user?.organizations?.[0]?.id;
if (teamId) { if (teamId) {
queryClient.invalidateQueries({ queryClient.invalidateQueries({
queryKey: [queryKeys.userGetUserList({ team_id: teamId }).queryKey], queryKey: [userQueryKeys.userGetUserList({ team_id: teamId }).queryKey],
refetchType: 'all' refetchType: 'all'
}); });
} }

3
apps/web/src/api/query_keys/users.ts
View File

@ -10,7 +10,6 @@ import type {
BusterUserTeamListItem, BusterUserTeamListItem,
OrganizationUser OrganizationUser
} from '@/api/asset_interfaces/users'; } from '@/api/asset_interfaces/users';
import type { getUserList } from '../buster_rest/users/requests';
const favoritesGetList = queryOptions<BusterUserFavorite[]>({ const favoritesGetList = queryOptions<BusterUserFavorite[]>({
queryKey: ['myself', 'list', 'favorites'] as const, queryKey: ['myself', 'list', 'favorites'] as const,
@ -54,7 +53,7 @@ const userGetUserDatasetGroups = (userId: string) =>
queryKey: ['users', userId, 'datasetGroups'] as const queryKey: ['users', userId, 'datasetGroups'] as const
}); });
const userGetUserList = (params: Parameters<typeof getUserList>[0]) => const userGetUserList = (params: { team_id: string; page?: number; page_size?: number }) =>
queryOptions<BusterUserListItem[]>({ queryOptions<BusterUserListItem[]>({
queryKey: ['users', 'list', params] as const queryKey: ['users', 'list', params] as const
}); });