From fc335fbc1f01dd067bd3bbeeb21edb52b4206821 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Tue, 24 May 2022 19:08:08 +0800 Subject: [PATCH] feat: improve data fetch --- packages/client/src/data/collector.tsx | 2 +- packages/client/src/data/message.ts | 2 +- packages/client/src/data/template.ts | 4 ++-- packages/client/src/data/wiki.tsx | 2 +- packages/client/src/pages/find/index.tsx | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/client/src/data/collector.tsx b/packages/client/src/data/collector.tsx index 171a5511..9d94040a 100644 --- a/packages/client/src/data/collector.tsx +++ b/packages/client/src/data/collector.tsx @@ -142,7 +142,7 @@ export const toggleCollectDocument = (documentId, cookie = null): Promise { - const { data, error, refetch } = useQuery(`${CollectorApiDefinition.check.client()}?documentId=${documentId}`, () => + const { data, error, refetch } = useQuery([CollectorApiDefinition.check.client(), documentId], () => getDocumentIsCollected(documentId) ); diff --git a/packages/client/src/data/message.ts b/packages/client/src/data/message.ts index f965557f..fc177bb9 100644 --- a/packages/client/src/data/message.ts +++ b/packages/client/src/data/message.ts @@ -61,7 +61,7 @@ export const useUnreadMessages = () => { const { data, error, isLoading, refetch } = useQuery( [MessageApiDefinition.getUnread.client(), page], () => getMessagesApi('getUnread')(page), - { keepPreviousData: true, refetchInterval: 2000 } + { keepPreviousData: true, refetchInterval: 4000 } ); const readMessage = useCallback( diff --git a/packages/client/src/data/template.ts b/packages/client/src/data/template.ts index 862cc8ce..fd42dbfd 100644 --- a/packages/client/src/data/template.ts +++ b/packages/client/src/data/template.ts @@ -22,7 +22,7 @@ export const getPublicTemplates = ( export const usePublicTemplates = () => { const [page, setPage] = useState(1); - const { data, error, isLoading } = useQuery(`${TemplateApiDefinition.public.client()}?page=${page}`, () => + const { data, error, isLoading } = useQuery([TemplateApiDefinition.public.client(), page], () => getPublicTemplates(page) ); @@ -62,7 +62,7 @@ export const useOwnTemplates = () => { error, isLoading, refetch: mutate, - } = useQuery(`${TemplateApiDefinition.own.client()}?page=${page}`, () => getOwnTemplates(page)); + } = useQuery([TemplateApiDefinition.own.client(), page], () => getOwnTemplates(page)); const addTemplate = useCallback( async (data): Promise => { diff --git a/packages/client/src/data/wiki.tsx b/packages/client/src/data/wiki.tsx index c5f01595..d40f8bad 100644 --- a/packages/client/src/data/wiki.tsx +++ b/packages/client/src/data/wiki.tsx @@ -143,7 +143,7 @@ export const getAllPublicWikis = ( */ export const useAllPublicWikis = () => { const [page, setPage] = useState(1); - const { data, error, isLoading } = useQuery(`${WikiApiDefinition.getPublicWikis.client()}?page=${page}`, () => + const { data, error, isLoading } = useQuery([WikiApiDefinition.getPublicWikis.client(), page], () => getAllPublicWikis(page) ); diff --git a/packages/client/src/pages/find/index.tsx b/packages/client/src/pages/find/index.tsx index f1700e2e..15662579 100644 --- a/packages/client/src/pages/find/index.tsx +++ b/packages/client/src/pages/find/index.tsx @@ -75,7 +75,7 @@ const Page: NextPage = () => { Page.getInitialProps = async (ctx) => { const props = await serverPrefetcher(ctx, [ - { url: `${WikiApiDefinition.getAllWikis.client()}?page=1`, action: (cookie) => getAllPublicWikis(1, cookie) }, + { url: [WikiApiDefinition.getAllWikis.client(), 1], action: (cookie) => getAllPublicWikis(1, cookie) }, ]); return props; };