mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-30 20:49:21 +08:00
fix: fetch all knowledge bases via pagination in link-to-dataset dialog (#17170)
This commit is contained in:
@@ -51,7 +51,7 @@ import {
|
||||
} from '@tanstack/react-query';
|
||||
import { useDebounce } from 'ahooks';
|
||||
import { omit } from 'lodash';
|
||||
import { useCallback, useMemo, useState } from 'react';
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { useParams, useSearchParams } from 'react-router';
|
||||
import {
|
||||
useGetPaginationWithRouter,
|
||||
@@ -234,7 +234,9 @@ export const useCreateKnowledge = () => {
|
||||
message.success(
|
||||
i18n.t(`message.${params?.id ? 'modified' : 'created'}`),
|
||||
);
|
||||
queryClient.invalidateQueries({ queryKey: ['fetchKnowledgeList'] });
|
||||
queryClient.invalidateQueries({
|
||||
queryKey: [KnowledgeApiAction.FetchKnowledgeList],
|
||||
});
|
||||
}
|
||||
return data;
|
||||
},
|
||||
@@ -818,43 +820,114 @@ export const useClearWiki = () => {
|
||||
return { data, loading, clearWiki: mutateAsync };
|
||||
};
|
||||
|
||||
export const useFetchKnowledgeList = (
|
||||
shouldFilterListWithoutDocument: boolean = false,
|
||||
keywords = '',
|
||||
): {
|
||||
list: IDataset[];
|
||||
loading: boolean;
|
||||
} => {
|
||||
const { data, isFetching: loading } = useQuery({
|
||||
queryKey: [
|
||||
const KNOWLEDGE_LIST_PAGE_SIZE = 10;
|
||||
|
||||
export const KnowledgeListKeys = {
|
||||
list: (
|
||||
shouldFilterListWithoutDocument: boolean,
|
||||
keywords: string,
|
||||
pageSize: number,
|
||||
) =>
|
||||
[
|
||||
KnowledgeApiAction.FetchKnowledgeList,
|
||||
shouldFilterListWithoutDocument,
|
||||
keywords,
|
||||
],
|
||||
initialData: [],
|
||||
gcTime: 0, // https://tanstack.com/query/latest/docs/framework/react/guides/caching?from=reactQueryV3
|
||||
queryFn: async () => {
|
||||
const { data } = await listDataset(
|
||||
keywords
|
||||
? {
|
||||
ext: {
|
||||
keywords,
|
||||
},
|
||||
}
|
||||
: undefined,
|
||||
);
|
||||
const list = data?.data ?? [];
|
||||
return shouldFilterListWithoutDocument
|
||||
? list.filter((x: IDataset) => x.chunk_count > 0)
|
||||
: list;
|
||||
},
|
||||
});
|
||||
pageSize,
|
||||
] as const,
|
||||
};
|
||||
|
||||
return { list: data, loading };
|
||||
export const useFetchKnowledgeList = (
|
||||
shouldFilterListWithoutDocument: boolean = false,
|
||||
keywords = '',
|
||||
pageSize: number = KNOWLEDGE_LIST_PAGE_SIZE,
|
||||
): {
|
||||
list: IDataset[];
|
||||
loading: boolean;
|
||||
fetchNextPage: () => void;
|
||||
hasNextPage: boolean;
|
||||
isFetchingNextPage: boolean;
|
||||
handleScroll: (e: React.UIEvent<HTMLDivElement>) => void;
|
||||
} => {
|
||||
const { data, fetchNextPage, hasNextPage, isFetching, isFetchingNextPage } =
|
||||
useInfiniteQuery<{ items: IDataset[] }>({
|
||||
queryKey: KnowledgeListKeys.list(
|
||||
shouldFilterListWithoutDocument,
|
||||
keywords,
|
||||
pageSize,
|
||||
),
|
||||
gcTime: 0,
|
||||
initialPageParam: 1,
|
||||
queryFn: async ({ pageParam }) => {
|
||||
const page = pageParam as number;
|
||||
const { data } = await listDataset({
|
||||
page,
|
||||
page_size: pageSize,
|
||||
...(keywords ? { ext: { keywords } } : {}),
|
||||
});
|
||||
return { items: (data?.data ?? []) as IDataset[] };
|
||||
},
|
||||
getNextPageParam: (lastPage, allPages) =>
|
||||
lastPage.items.length >= pageSize ? allPages.length + 1 : undefined,
|
||||
});
|
||||
|
||||
const list = useMemo(() => {
|
||||
const all = data?.pages.flatMap((page) => page.items) ?? [];
|
||||
return shouldFilterListWithoutDocument
|
||||
? all.filter((x) => x.chunk_count > 0)
|
||||
: all;
|
||||
}, [data, shouldFilterListWithoutDocument]);
|
||||
|
||||
const handleScroll = useCallback(
|
||||
(e: React.UIEvent<HTMLDivElement>) => {
|
||||
const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
|
||||
const threshold = 50;
|
||||
if (
|
||||
scrollHeight - scrollTop - clientHeight <= threshold &&
|
||||
hasNextPage &&
|
||||
!isFetchingNextPage
|
||||
) {
|
||||
fetchNextPage();
|
||||
}
|
||||
},
|
||||
[fetchNextPage, hasNextPage, isFetchingNextPage],
|
||||
);
|
||||
|
||||
return {
|
||||
list,
|
||||
loading: isFetching,
|
||||
fetchNextPage,
|
||||
hasNextPage,
|
||||
isFetchingNextPage,
|
||||
handleScroll,
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* For consumers that need the COMPLETE list (no scroll UI).
|
||||
* Uses a large page size to minimize round-trips, and auto-loads
|
||||
* until exhausted.
|
||||
*/
|
||||
export const useFetchAllKnowledgeList = (
|
||||
shouldFilterListWithoutDocument: boolean = false,
|
||||
keywords = '',
|
||||
): { list: IDataset[]; loading: boolean } => {
|
||||
const { list, loading, hasNextPage, fetchNextPage } = useFetchKnowledgeList(
|
||||
shouldFilterListWithoutDocument,
|
||||
keywords,
|
||||
200,
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (hasNextPage && !loading) {
|
||||
fetchNextPage();
|
||||
}
|
||||
}, [hasNextPage, loading, fetchNextPage]);
|
||||
|
||||
return { list, loading };
|
||||
};
|
||||
|
||||
export const useSelectKnowledgeOptions = () => {
|
||||
const { list } = useFetchKnowledgeList();
|
||||
const { list } = useFetchAllKnowledgeList();
|
||||
|
||||
const options = list?.map((item) => ({
|
||||
label: item.name,
|
||||
|
||||
Reference in New Issue
Block a user