temp

Author: ykmsd

front/components/InfiniteScroll.tsx

@@ -15,6 +15,7 @@ export const InfiniteScroll = ({
   showLoader,
   loader,
 }: InfiniteScrollProps) => {
+
   const { ref, inView } = useInView();
   useEffect(() => {
     if (inView && hasMore) {

front/components/assistant/conversation/input_bar/InputBarAttachmentsPicker.tsx

@@ -25,7 +25,7 @@ import {
   getLocationForDataSourceViewContentNode,
   getVisualForDataSourceViewContentNode,
 } from "@app/lib/content_nodes";
-import { useSpaces, useSpacesSearch } from "@app/lib/swr/spaces";
+import { useSpaces, useSpaceSearchWithInfiniteScroll, useSpacesSearch } from "@app/lib/swr/spaces";
 import type { DataSourceViewContentNode, LightWorkspaceType } from "@app/types";
 import { MIN_SEARCH_QUERY_SIZE } from "@app/types";
 
@@ -67,9 +67,7 @@ export const InputBarAttachmentsPicker = ({
   const fileInputRef = useRef<HTMLInputElement>(null);
   const itemsContainerRef = useRef<HTMLDivElement>(null);
   const [isOpen, setIsOpen] = useState(false);
-  const [currentResultNodes, setCurrentResultNodes] = useState<
-    DataSourceViewContentNode[]
-  >([]);
+
 
   const {
     inputValue: search,
@@ -81,23 +79,15 @@ export const InputBarAttachmentsPicker = ({
     minLength: MIN_SEARCH_QUERY_SIZE,
   });
 
-  const {
-    cursorPagination,
-    reset: resetPagination,
-    handleLoadNext,
-    pageIndex,
-  } = useCursorPagination(PAGE_SIZE);
-
   const { spaces, isSpacesLoading } = useSpaces({ workspaceId: owner.sId });
-  const { searchResultNodes, isSearchLoading, nextPageCursor } =
-    useSpacesSearch({
+
+
+  const { searchResultNodes, isSearchLoading, hasMore, nextPage } =
+    useSpaceSearchWithInfiniteScroll({
       includeDataSources: true,
       owner,
       search: searchQuery,
       viewType: "all",
-      disabled: isSpacesLoading || !searchQuery,
-      spaceIds: spaces.map((s) => s.sId),
-      pagination: cursorPagination,
     });
 
   const attachedNodeIds = useMemo(() => {
@@ -115,22 +105,11 @@ export const InputBarAttachmentsPicker = ({
     }
   };
 
-  useEffect(() => {
-    resetPagination();
-  }, [searchQuery, resetPagination]);
-
-  useEffect(() => {
-    if (searchResultNodes && !isSearchLoading) {
-      const unfoldedNodes = getUnfoldedNodes(searchResultNodes);
-      setCurrentResultNodes((prevResultNodes) => {
-        if (pageIndex === 0) {
-          return unfoldedNodes;
-        } else {
-          return [...prevResultNodes, ...unfoldedNodes];
-        }
-      });
-    }
-  }, [searchResultNodes, isSearchLoading, pageIndex]);
+  // useEffect(() => {
+  //   resetPagination();
+  // }, [searchQuery, resetPagination]);
+
+  const unfoldedNodes = getUnfoldedNodes(searchResultNodes);
 
   return (
     <DropdownMenu
@@ -197,8 +176,8 @@ export const InputBarAttachmentsPicker = ({
             <DropdownMenuSeparator />
             <ScrollArea className="flex max-h-96 flex-col" hideScrollBar>
               <div className="pt-0" ref={itemsContainerRef}>
-                {currentResultNodes.length > 0 ? (
-                  currentResultNodes.map((item, index) => (
+                {unfoldedNodes.length > 0 ? (
+                  unfoldedNodes.map((item, index) => (
                     <DropdownMenuItem
                       key={index}
                       label={item.title}
@@ -232,9 +211,9 @@ export const InputBarAttachmentsPicker = ({
                 )}
               </div>
               <InfiniteScroll
-                nextPage={() => handleLoadNext(nextPageCursor)}
-                hasMore={!!nextPageCursor}
-                showLoader={currentResultNodes.length > 0 && isSearchLoading}
+                nextPage={nextPage}
+                hasMore={hasMore}
+                showLoader={unfoldedNodes.length > 0 && isSearchLoading}
                 loader={<Loader />}
               />
               <ScrollBar className="py-0" />

front/lib/api/search.ts

@@ -31,6 +31,7 @@ export type DataSourceContentNode = ContentNodeWithParent & {
 export type SearchResult = {
   nodes: DataSourceContentNode[];
   warningCode: SearchWarningCode | null;
+  nextPageCursor: string | null;
 };
 
 type SearchError = {

front/lib/swr/spaces.ts

@@ -1,3 +1,4 @@
+import type { PostWorkspaceSearchResponseBodySchema, PostWorkspaceSearchResponseBodyType } from "@dust-tt/client";
 import { useSendNotification } from "@dust-tt/sparkle";
 import { useMemo } from "react";
 import type { Fetcher, KeyedMutator } from "swr";
@@ -6,9 +7,11 @@ import type { CursorPaginationParams } from "@app/lib/api/pagination";
 import { getDisplayNameForDataSource } from "@app/lib/data_sources";
 import { getSpaceName } from "@app/lib/spaces";
 import {
+  appendPaginationParams,
   fetcher,
   fetcherWithBody,
   getErrorFromResponse,
+  useSWRInfiniteWithDefaults,
   useSWRWithDefaults,
 } from "@app/lib/swr/swr";
 import type {
@@ -778,3 +781,81 @@ export function useSpacesSearch({
     nextPageCursor: data?.nextPageCursor || null,
   };
 }
+
+export function useSpaceSearchWithInfiniteScroll({
+  includeDataSources = false,
+  nodeIds,
+  owner,
+  search,
+  spaceIds,
+  viewType,
+  pageSize = 25,
+}: SpacesSearchParams & { pageSize?: number }): {
+  isSearchLoading: boolean;
+  isSearchError: boolean;
+  isSearchValidating: boolean;
+  searchResultNodes: DataSourceContentNode[];
+  totalNodesCount: number;
+  // warningCode: SearchWarningCode | null;
+  nextPage: () => Promise<void>;
+  hasMore: boolean;
+} {
+
+  const body = {
+    query: search,
+    viewType,
+    nodeIds,
+    spaceIds,
+    includeDataSources,
+    limit: pageSize,
+  };
+
+  // Only perform a query if we have a valid search
+  const url =
+    (search && search.length >= MIN_SEARCH_QUERY_SIZE) || nodeIds
+      ? `/api/w/${owner.sId}/search`
+      : null;
+
+
+  const nodesFetcher: Fetcher<PostWorkspaceSearchResponseBodyType> = fetcherWithBody;
+
+  const { data, error, setSize, size, isValidating, isLoading } = useSWRInfiniteWithDefaults(
+    (pageIndex, previousPageData) => {
+      if (!url) {
+        return null;
+      }
+
+      const params = new URLSearchParams();
+
+      params.append('limit', pageSize.toString());
+
+      if (previousPageData) {
+        params.append("cursor", previousPageData?.nextPageCursor);
+      }
+
+      return JSON.stringify([url + "?" + params.toString(), body]);
+    },
+    nodesFetcher,
+    {
+      revalidateOnFocus: false,
+      revalidateOnReconnect: false,
+    }
+  );
+
+  return {
+    searchResultNodes: useMemo(
+      () => (data ? data.flatMap((d) => (d ? d.nodes : [])) : []),
+      [data]
+    ),
+    isSearchLoading: isLoading,
+    isSearchError: error,
+    isSearchValidating: isValidating,
+    totalNodesCount: data?.[0] ? data[0].total : 0,
+    // warningCode: data?.warningCode,
+    hasMore: data?.[size - 1] ? data[size - 1].nextPageCursor !== null : false,
+    nextPage: async () => {
+      await setSize((size) => size + 1);
+    },
+  };
+}
+

front/pages/api/w/[wId]/search.ts

@@ -22,6 +22,7 @@ export type DataSourceContentNode = ContentNodeWithParent & {
 export type PostWorkspaceSearchResponseBody = {
   nodes: DataSourceContentNode[];
   warningCode: SearchWarningCode | null;
+  nextPageCursor: string | null;
 };
 
 async function handler(