@mezo-org/passport 0.10.0-dev.2 → 0.10.0-dev.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/hooks/useGetCurrentAccount.d.ts +8 -10
- package/dist/src/hooks/useGetCurrentAccount.d.ts.map +1 -1
- package/dist/src/hooks/useGetCurrentAccount.js +15 -7
- package/dist/src/hooks/useGetCurrentAccount.js.map +1 -1
- package/package.json +1 -1
- package/src/hooks/useGetCurrentAccount.ts +27 -12
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { UseQueryOptions } from "@tanstack/react-query";
|
|
1
|
+
import { QueryKey, UseQueryOptions, UseQueryResult } from "@tanstack/react-query";
|
|
2
2
|
import type { GetCurrentAccountResponse, PortalMats, RewardsMats } from "../api";
|
|
3
3
|
type GetCurrentAccountResponseWithMats = GetCurrentAccountResponse & {
|
|
4
4
|
mats: (PortalMats | RewardsMats)[];
|
|
@@ -6,14 +6,12 @@ type GetCurrentAccountResponseWithMats = GetCurrentAccountResponse & {
|
|
|
6
6
|
};
|
|
7
7
|
export declare const isRewardsMats: (value: unknown) => value is RewardsMats;
|
|
8
8
|
export declare const isPortalMats: (value: unknown) => value is PortalMats;
|
|
9
|
-
type UseGetCurrentAccountOptions<TSelected
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
totalMats: number;
|
|
17
|
-
}, Error>;
|
|
9
|
+
type UseGetCurrentAccountOptions<TSelected> = Omit<UseQueryOptions<GetCurrentAccountResponseWithMats, Error, TSelected>, "queryKey" | "queryFn">;
|
|
10
|
+
/**
|
|
11
|
+
* Hook to fetch current account with mats
|
|
12
|
+
*/
|
|
13
|
+
export declare function useGetCurrentAccount<TSelected = GetCurrentAccountResponseWithMats>(options?: UseGetCurrentAccountOptions<TSelected>): UseQueryResult<TSelected, Error> & {
|
|
14
|
+
queryKey: QueryKey;
|
|
15
|
+
};
|
|
18
16
|
export {};
|
|
19
17
|
//# sourceMappingURL=useGetCurrentAccount.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGetCurrentAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"useGetCurrentAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAER,eAAe,EACf,cAAc,EACf,MAAM,uBAAuB,CAAA;AAK9B,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAIhF,KAAK,iCAAiC,GAAG,yBAAyB,GAAG;IACnE,IAAI,EAAE,CAAC,UAAU,GAAG,WAAW,CAAC,EAAE,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,WAUrD,CAAA;AAEH,eAAO,MAAM,YAAY,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,UAOpD,CAAA;AAEH,KAAK,2BAA2B,CAAC,SAAS,IAAI,IAAI,CAChD,eAAe,CAAC,iCAAiC,EAAE,KAAK,EAAE,SAAS,CAAC,EACpE,UAAU,GAAG,SAAS,CACvB,CAAA;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,GAAG,iCAAiC,EAE7C,OAAO,GAAE,2BAA2B,CAAC,SAAS,CAAM,GACnD,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,CA+D3D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useContext } from "react";
|
|
2
|
-
import { useQuery } from "@tanstack/react-query";
|
|
2
|
+
import { useQuery, } from "@tanstack/react-query";
|
|
3
3
|
import { ONE_MINUTE_MS } from "../utils/time";
|
|
4
4
|
import { QUERY_KEYS } from "./constants";
|
|
5
5
|
import { useAuthApiClient } from "./useAuthApiClient";
|
|
@@ -16,13 +16,17 @@ export const isPortalMats = (value) => !!value &&
|
|
|
16
16
|
["totalMats", "inactiveMats", "matsActivated"].every((fieldKey) => fieldKey === "matsActivated"
|
|
17
17
|
? typeof value[fieldKey] === "boolean"
|
|
18
18
|
: typeof value[fieldKey] === "number");
|
|
19
|
-
|
|
19
|
+
/**
|
|
20
|
+
* Hook to fetch current account with mats
|
|
21
|
+
*/
|
|
22
|
+
export function useGetCurrentAccount(options = {}) {
|
|
20
23
|
const passportContext = useContext(PassportContext);
|
|
21
24
|
const authApiClient = useAuthApiClient();
|
|
22
25
|
const portalApiClient = usePortalApiClient();
|
|
23
26
|
const rewardsApiClient = useRewardsApiClient();
|
|
24
|
-
|
|
25
|
-
|
|
27
|
+
const queryKey = [QUERY_KEYS.ACCOUNT, QUERY_KEYS.CURRENT];
|
|
28
|
+
const query = useQuery({
|
|
29
|
+
queryKey,
|
|
26
30
|
queryFn: async () => {
|
|
27
31
|
const currentAccount = await authApiClient.getCurrentAccount();
|
|
28
32
|
if (!currentAccount) {
|
|
@@ -49,9 +53,13 @@ export function useGetCurrentAccount(queryOptions = {}) {
|
|
|
49
53
|
totalMats,
|
|
50
54
|
};
|
|
51
55
|
},
|
|
52
|
-
staleTime: ONE_MINUTE_MS,
|
|
53
|
-
retry: 1,
|
|
54
|
-
...
|
|
56
|
+
staleTime: options.staleTime ?? ONE_MINUTE_MS,
|
|
57
|
+
retry: options.retry ?? 1,
|
|
58
|
+
...options,
|
|
55
59
|
});
|
|
60
|
+
return {
|
|
61
|
+
...query,
|
|
62
|
+
queryKey,
|
|
63
|
+
};
|
|
56
64
|
}
|
|
57
65
|
//# sourceMappingURL=useGetCurrentAccount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGetCurrentAccount.js","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"useGetCurrentAccount.js","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { useContext } from "react"
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
QueryKey,
|
|
4
|
+
useQuery,
|
|
5
|
+
UseQueryOptions,
|
|
6
|
+
UseQueryResult,
|
|
7
|
+
} from "@tanstack/react-query"
|
|
3
8
|
import { ONE_MINUTE_MS } from "../utils/time"
|
|
4
9
|
import { QUERY_KEYS } from "./constants"
|
|
5
10
|
import { useAuthApiClient } from "./useAuthApiClient"
|
|
@@ -34,24 +39,29 @@ export const isPortalMats = (value: unknown): value is PortalMats =>
|
|
|
34
39
|
: typeof (value as never)[fieldKey] === "number",
|
|
35
40
|
)
|
|
36
41
|
|
|
37
|
-
type UseGetCurrentAccountOptions<
|
|
38
|
-
TSelected = GetCurrentAccountResponseWithMats,
|
|
39
|
-
> = Omit<
|
|
42
|
+
type UseGetCurrentAccountOptions<TSelected> = Omit<
|
|
40
43
|
UseQueryOptions<GetCurrentAccountResponseWithMats, Error, TSelected>,
|
|
41
44
|
"queryKey" | "queryFn"
|
|
42
45
|
>
|
|
43
46
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Hook to fetch current account with mats
|
|
49
|
+
*/
|
|
50
|
+
export function useGetCurrentAccount<
|
|
51
|
+
TSelected = GetCurrentAccountResponseWithMats,
|
|
52
|
+
>(
|
|
53
|
+
options: UseGetCurrentAccountOptions<TSelected> = {},
|
|
54
|
+
): UseQueryResult<TSelected, Error> & { queryKey: QueryKey } {
|
|
47
55
|
const passportContext = useContext(PassportContext)
|
|
48
56
|
|
|
49
57
|
const authApiClient = useAuthApiClient()
|
|
50
58
|
const portalApiClient = usePortalApiClient()
|
|
51
59
|
const rewardsApiClient = useRewardsApiClient()
|
|
52
60
|
|
|
53
|
-
|
|
54
|
-
|
|
61
|
+
const queryKey = [QUERY_KEYS.ACCOUNT, QUERY_KEYS.CURRENT]
|
|
62
|
+
|
|
63
|
+
const query = useQuery<GetCurrentAccountResponseWithMats, Error, TSelected>({
|
|
64
|
+
queryKey,
|
|
55
65
|
queryFn: async () => {
|
|
56
66
|
const currentAccount = await authApiClient.getCurrentAccount()
|
|
57
67
|
if (!currentAccount) {
|
|
@@ -95,8 +105,13 @@ export function useGetCurrentAccount(
|
|
|
95
105
|
totalMats,
|
|
96
106
|
}
|
|
97
107
|
},
|
|
98
|
-
staleTime: ONE_MINUTE_MS,
|
|
99
|
-
retry: 1,
|
|
100
|
-
...
|
|
108
|
+
staleTime: options.staleTime ?? ONE_MINUTE_MS,
|
|
109
|
+
retry: options.retry ?? 1,
|
|
110
|
+
...options,
|
|
101
111
|
})
|
|
112
|
+
|
|
113
|
+
return {
|
|
114
|
+
...query,
|
|
115
|
+
queryKey,
|
|
116
|
+
}
|
|
102
117
|
}
|