Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[frontend] upgrade to react-query v5 #14346

Merged
merged 24 commits into from
Oct 24, 2023
Merged

[frontend] upgrade to react-query v5 #14346

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
806dcc5
TanStack Query v5
Jordan-Mysten Oct 19, 2023
7f0f3e7
fix
williamrobertson13 Oct 19, 2023
92b69da
fix
williamrobertson13 Oct 19, 2023
4042ac8
work
williamrobertson13 Oct 19, 2023
2f8a5ab
fix
williamrobertson13 Oct 19, 2023
e3e0b72
work
williamrobertson13 Oct 19, 2023
997521c
fix
williamrobertson13 Oct 19, 2023
b651867
ix
williamrobertson13 Oct 19, 2023
6bb0c0a
fix
williamrobertson13 Oct 19, 2023
caaa8a0
work
williamrobertson13 Oct 19, 2023
138c4f2
fix
williamrobertson13 Oct 19, 2023
9ecf272
work
williamrobertson13 Oct 23, 2023
df6d37f
support select
williamrobertson13 Oct 23, 2023
db96274
Merge remote-tracking branch 'origin/main' into wrobertson/v5_query
williamrobertson13 Oct 24, 2023
8c64d63
fix tests
williamrobertson13 Oct 24, 2023
eec1b26
work
williamrobertson13 Oct 24, 2023
14e36a8
work
williamrobertson13 Oct 24, 2023
16845a5
work
williamrobertson13 Oct 24, 2023
2400981
fix
williamrobertson13 Oct 24, 2023
0f5874a
fix
williamrobertson13 Oct 24, 2023
96d45e5
fix
williamrobertson13 Oct 24, 2023
2fb28de
fix
williamrobertson13 Oct 24, 2023
5c9162e
fix
williamrobertson13 Oct 24, 2023
575d011
fix
williamrobertson13 Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@williamrobertson13
williamrobertson13 committed Oct 23, 2023
commit 6bb0c0a6ead780d5b9a3b98e99fd2ea95e89e4ec
10 changes: 4 additions & 6 deletions sdk/dapp-kit/src/hooks/useResolveSuiNSNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ import { useSuiClientQuery } from './useSuiClientQuery.js';
export function useResolveSuiNSName(
address?: string | null,
options?: Omit<
UseQueryOptions<ResolvedNameServiceNames, Error, ResolvedNameServiceNames, unknown[]>,
UseQueryOptions<ResolvedNameServiceNames, Error, string | null, unknown[]>,
'queryFn' | 'queryKey'
williamrobertson13 marked this conversation as resolved.
Show resolved Hide resolved
>,
// TODO: Fix return type:
): any {
const { data, ...rest } = useSuiClientQuery(
) {
return useSuiClientQuery(
'resolveNameServiceNames',
{
address: address!,
Expand All @@ -24,9 +23,8 @@ export function useResolveSuiNSName(
...options,
refetchOnWindowFocus: false,
retry: false,
select: (data) => (data.data.length > 0 ? data.data[0] : null),
enabled: !!address && options?.enabled !== false,
},
);

return { data: data?.data?.[0] ?? null, ...rest };
}
18 changes: 9 additions & 9 deletions sdk/dapp-kit/src/hooks/useSuiClientQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@ export type SuiRpcMethods = {
: never;
};

export type UseSuiClientQueryOptions<T extends keyof SuiRpcMethods> = PartialBy<
Omit<
UseQueryOptions<SuiRpcMethods[T]['result'], Error, SuiRpcMethods[T]['result'], unknown[]>,
'queryFn'
>,
export type UseSuiClientQueryOptions<
T extends keyof SuiRpcMethods,
TData = SuiRpcMethods[T]['result'],
> = PartialBy<
Omit<UseQueryOptions<SuiRpcMethods[T]['result'], Error, TData, unknown[]>, 'queryFn'>,
'queryKey'
>;

export function useSuiClientQuery<T extends keyof SuiRpcMethods>(
export function useSuiClientQuery<T extends keyof SuiRpcMethods, TData>(
...args: undefined extends SuiRpcMethods[T]['params']
? [method: T, params?: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T>]
: [method: T, params: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T>]
? [method: T, params?: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T, TData>]
: [method: T, params: SuiRpcMethods[T]['params'], options?: UseSuiClientQueryOptions<T, TData>]
) {
const [method, params, { queryKey = [], ...options } = {}] = args as [
method: T,
params?: SuiRpcMethods[T]['params'],
options?: UseSuiClientQueryOptions<T>,
options?: UseSuiClientQueryOptions<T, TData>,
];

const suiContext = useSuiClientContext();
Expand Down