apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-07-14 22:52:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

feat: replace getDocumentTypeCounts with useQuery implementation (10min stale time)

Browse source
This commit is contained in:
CREDO23 2025-12-08 09:10:04 +00:00
parent 42e10bbe55
commit e7982ead4e
2 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
surfsense_web/atoms/documents/document-query.atoms.ts
View file

@ -26,6 +26,7 @@ export const documentTypeCountsAtom = atomWithQuery((get) => {
return { return {
queryKey: cacheKeys.documents.typeCounts(searchSpaceId ?? undefined), queryKey: cacheKeys.documents.typeCounts(searchSpaceId ?? undefined),
enabled: !!searchSpaceId, enabled: !!searchSpaceId,
staleTime: 10 * 60 * 1000, // 10 minutes
queryFn: async () => { queryFn: async () => {
return documentsApiService.getDocumentTypeCounts({ return documentsApiService.getDocumentTypeCounts({
queryParams: { queryParams: {

29
surfsense_web/components/chat/DocumentsDataTable.tsx
View file

@ -36,6 +36,8 @@ import { type Document, type DocumentType, useDocuments } from "@/hooks/use-docu
import { documentsApiService } from "@/lib/apis/documents-api.service"; import { documentsApiService } from "@/lib/apis/documents-api.service";
import { cacheKeys } from "@/lib/query-client/cache-keys"; import { cacheKeys } from "@/lib/query-client/cache-keys";
import { DocumentTypeEnum } from "@/contracts/types/document.types"; import { DocumentTypeEnum } from "@/contracts/types/document.types";
import { useAtomValue } from "jotai";
import { documentTypeCountsAtom } from "@/atoms/documents/document-query.atoms";
interface DocumentsDataTableProps { interface DocumentsDataTableProps {
searchSpaceId: number; searchSpaceId: number;
@ -189,7 +191,7 @@ export function DocumentsDataTable({
const [documentTypeFilter, setDocumentTypeFilter] = useState<DocumentTypeEnum[]>([]); const [documentTypeFilter, setDocumentTypeFilter] = useState<DocumentTypeEnum[]>([]);
const [pageIndex, setPageIndex] = useState(0); const [pageIndex, setPageIndex] = useState(0);
const [pageSize, setPageSize] = useState(10); const [pageSize, setPageSize] = useState(10);
const [typeCounts, setTypeCounts] = useState<Record<string, number>>({}); const {data : typeCounts } = useAtomValue(documentTypeCountsAtom);
const fetchQueryParams = useMemo( const fetchQueryParams = useMemo(
() => ({ () => ({
@ -203,10 +205,13 @@ export function DocumentsDataTable({
const searchQueryParams = useMemo(() => { const searchQueryParams = useMemo(() => {
return { return {
...fetchQueryParams, search_space_id: searchSpaceId,
page: pageIndex ,
page_size: pageSize,
...(documentTypeFilter.length > 0 && { document_types: documentTypeFilter }),
title : debouncedSearch, title : debouncedSearch,
} }
},[debouncedSearch]) },[debouncedSearch, searchSpaceId, pageIndex, pageSize, documentTypeFilter, debouncedSearch])
// Use query for fetching documents // Use query for fetching documents
const { const {
@ -230,25 +235,13 @@ export function DocumentsDataTable({
enabled: !!searchSpaceId && !!debouncedSearch.trim(), enabled: !!searchSpaceId && !!debouncedSearch.trim(),
}); });
// Use server-side pagination, search, and filtering
const { getDocumentTypeCounts } =
useDocuments(searchSpaceId, {
page: pageIndex,
pageSize: pageSize,
});
// Use query data when not searching, otherwise use hook data // Use query data when not searching, otherwise use hook data
const actualDocuments = debouncedSearch.trim() ? searchedDocuments?.items|| [] : documents?.items|| []; const actualDocuments = debouncedSearch.trim() ? searchedDocuments?.items|| [] : documents?.items|| [];
const actualTotal = debouncedSearch.trim() ? searchedDocuments?.total || 0 : documents?.total || 0; const actualTotal = debouncedSearch.trim() ? searchedDocuments?.total || 0 : documents?.total || 0;
const actualLoading = debouncedSearch.trim() ? isSearchedDocumentsLoading : isDocumentsLoading; const actualLoading = debouncedSearch.trim() ? isSearchedDocumentsLoading : isDocumentsLoading;
// Fetch document type counts on mount
useEffect(() => {
if (searchSpaceId && getDocumentTypeCounts) {
getDocumentTypeCounts().then(setTypeCounts);
}
}, [searchSpaceId, getDocumentTypeCounts]);
// Memoize initial row selection to prevent infinite loops // Memoize initial row selection to prevent infinite loops
const initialRowSelection = useMemo(() => { const initialRowSelection = useMemo(() => {
if (!initialSelectedDocuments.length) return {}; if (!initialSelectedDocuments.length) return {};
@ -378,7 +371,7 @@ export function DocumentsDataTable({
// Get available document types from type counts (memoized) // Get available document types from type counts (memoized)
const availableTypes = useMemo(() => { const availableTypes = useMemo(() => {
const types = Object.keys(typeCounts) as DocumentTypeEnum[]; const types = typeCounts ? Object.keys(typeCounts) as DocumentTypeEnum[] : [];
return types.length > 0 ? types.sort() : []; return types.length > 0 ? types.sort() : [];
}, [typeCounts]); }, [typeCounts]);
@ -428,7 +421,7 @@ export function DocumentsDataTable({
className="flex grow justify-between gap-2 font-normal text-sm cursor-pointer" className="flex grow justify-between gap-2 font-normal text-sm cursor-pointer"
> >
<span>{type.replace(/_/g, " ")}</span> <span>{type.replace(/_/g, " ")}</span>
<span className="text-xs text-muted-foreground">{typeCounts[type]}</span> <span className="text-xs text-muted-foreground">{typeCounts?.[type]}</span>
</Label> </Label>
</div> </div>
))} ))}