fix: index error when enable hidden match field for search

teableio · Jan 13, 2025 · 61f41d9 · 61f41d9
1 parent ea7acbe
commit 61f41d9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/apps/nestjs-backend/src/features/aggregation/aggregation.service.ts b/apps/nestjs-backend/src/features/aggregation/aggregation.service.ts
@@ -753,12 +753,18 @@ export class AggregationService {
     const recordIds = result;
 
     if (search[2]) {
-      const finalSkip = skip ?? 0;
-      return recordIds.map((rec, index) => ({
-        index: finalSkip + index + 1,
-        fieldId: rec.fieldId,
-        recordId: rec.__id,
-      }));
+      const baseSkip = skip ?? 0;
+      const accRecord: string[] = [];
+      return recordIds.map((rec) => {
+        if (!accRecord?.includes(rec.__id)) {
+          accRecord.push(rec.__id);
+        }
+        return {
+          index: baseSkip + accRecord?.length,
+          fieldId: rec.fieldId,
+          recordId: rec.__id,
+        };
+      });
     }
 
     // step 2. find the index in current view

diff --git a/apps/nextjs-app/src/features/app/blocks/view/search/SearchCountPagination.tsx b/apps/nextjs-app/src/features/app/blocks/view/search/SearchCountPagination.tsx
@@ -74,7 +74,7 @@ export const SearchCountPagination = forwardRef<
     ).size as number;
 
     const baseQueryRo: ISearchIndexByQueryRo = {
-      skip: skipLength,
+      skip: pageParam,
       take: PaginationBuffer,
       viewId: view?.id,
       orderBy: viewOrderBy,
@@ -124,6 +124,8 @@ export const SearchCountPagination = forwardRef<
     refetchOnMount: 'always',
     refetchOnWindowFocus: false,
     enabled: !!value,
+    initialData: undefined,
+    keepPreviousData: false,
     getNextPageParam: (lastPage) => {
       return lastPage.nextCursor;
     },
@@ -137,7 +139,7 @@ export const SearchCountPagination = forwardRef<
       finalResult[indexNumber] = result;
     });
     return finalResult;
-  }, [data]);
+  }, [data?.pages]);
 
   const switchIndex = (direction: PageDirection) => {
     const newIndex = currentIndex + direction;