fix metadata

labring · Jan 21, 2025 · d44fc26 · d44fc26
1 parent 0bb93b9
commit d44fc26
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 48 deletions.
diff --git a/packages/global/core/dataset/apiDataset.d.ts b/packages/global/core/dataset/apiDataset.d.ts
@@ -16,6 +16,7 @@ export type APIFileServer = {
 export type APIFileListResponse = {
   list: APIFileItem[];
   total: number;
+  metaData?: Record<string, any>;
 };
 
 export type APIFileContentResponse = {

diff --git a/packages/web/hooks/useScrollPagination.tsx b/packages/web/hooks/useScrollPagination.tsx
@@ -223,14 +223,12 @@ export function useScrollPagination<
         const res = await api({
           offset,
           pageSize,
-          ...metaData,
+          metaData,
           ...params
         } as TParams);
 
-        const { total: totalCount, list: dataList, metaData: resMetaData } = res;
-
-        setTotal(totalCount);
-        setMetaData(resMetaData);
+        setTotal(res.total);
+        setMetaData(res.metaData);
 
         if (scrollLoadType === 'top') {
           const prevHeight = ScrollContainerRef?.current?.scrollHeight || 0;
@@ -250,10 +248,10 @@ export function useScrollPagination<
             );
           }
 
-          setData((prevData) => (init ? dataList : [...dataList, ...prevData]));
+          setData((prevData) => (init ? res.list : [...res.list, ...prevData]));
           adjustScrollPosition();
         } else {
-          setData((prevData) => (init ? dataList : [...prevData, ...dataList]));
+          setData((prevData) => (init ? res.list : [...prevData, ...res.list]));
         }
       } catch (error: any) {
         if (showErrorToast) {

diff --git a/projects/app/src/pages/api/core/dataset/apiDataset/list.ts b/projects/app/src/pages/api/core/dataset/apiDataset/list.ts
@@ -14,22 +14,11 @@ export type GetApiDatasetFileListProps = {
   datasetId: string;
   offset: number;
   pageSize: number;
-};
-
-export type GetApiDatasetFileListResponse = {
-  list: APIFileItem[];
-  total: number;
+  metaData?: Record<string, any>;
 };
 
 async function handler(req: NextApiRequest) {
-  let {
-    searchKey = '',
-    parentId = null,
-    datasetId,
-    nextPageToken = '',
-    pageSize,
-    offset = 0
-  } = req.body;
+  let { searchKey = '', parentId = null, datasetId, pageSize, offset = 0, metaData } = req.body;
 
   const { dataset } = await authDataset({
     req,
@@ -60,9 +49,9 @@ async function handler(req: NextApiRequest) {
       feishuServer,
       yuqueServer,
       parentId,
-      nextPageToken,
       offset,
-      pageSize
+      pageSize,
+      metaData
     });
   }
 

diff --git a/projects/app/src/pages/dataset/detail/components/Import/diffSource/APIDataset.tsx b/projects/app/src/pages/dataset/detail/components/Import/diffSource/APIDataset.tsx
@@ -13,14 +13,11 @@ import { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type
 import FolderPath from '@/components/common/folder/Path';
 import { getSourceNameIcon } from '@fastgpt/global/core/dataset/utils';
 import MyBox from '@fastgpt/web/components/common/MyBox';
-import { APIFileItem } from '@fastgpt/global/core/dataset/apiDataset';
+import { APIFileItem, APIFileListResponse } from '@fastgpt/global/core/dataset/apiDataset';
 import SearchInput from '@fastgpt/web/components/common/Input/SearchInput';
 import { useMount } from 'ahooks';
 import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
-import {
-  GetApiDatasetFileListProps,
-  GetApiDatasetFileListResponse
-} from '@/pages/api/core/dataset/apiDataset/list';
+import { GetApiDatasetFileListProps } from '@/pages/api/core/dataset/apiDataset/list';
 
 const DataProcess = dynamic(() => import('../commonProgress/DataProcess'), {
   loading: () => <Loading fixed={false} />
@@ -62,18 +59,16 @@ const CustomAPIFileInput = () => {
     data: apiFileList,
     ScrollData,
     isLoading
-  } = useScrollPagination<GetApiDatasetFileListProps, GetApiDatasetFileListResponse>(
-    getApiDatasetFileList,
-    {
-      pageSize: 15,
-      params: {
-        datasetId: datasetDetail._id,
-        parentId: parent?.parentId,
-        searchKey: searchKey
-      },
-      refreshDeps: [datasetDetail._id, datasetDetail.apiServer, parent, searchKey]
-    }
-  );
+  } = useScrollPagination<GetApiDatasetFileListProps, APIFileListResponse>(getApiDatasetFileList, {
+    pageSize: 15,
+    params: {
+      datasetId: datasetDetail._id,
+      parentId: parent?.parentId,
+      searchKey: searchKey
+    },
+
+    refreshDeps: [datasetDetail._id, datasetDetail.apiServer, parent, searchKey]
+  });
 
   const { data: existIdList = [] } = useRequest2(
     () => getApiDatasetFileListExistId({ datasetId: datasetDetail._id }),

diff --git a/projects/app/src/service/core/dataset/apiDataset/controller.ts b/projects/app/src/service/core/dataset/apiDataset/controller.ts
@@ -1,16 +1,19 @@
-import { GetApiDatasetFileListResponse } from '@/pages/api/core/dataset/apiDataset/list';
-import { FeishuServer, YuqueServer } from '@fastgpt/global/core/dataset/apiDataset';
+import {
+  APIFileListResponse,
+  FeishuServer,
+  YuqueServer
+} from '@fastgpt/global/core/dataset/apiDataset';
 import { POST } from '@fastgpt/service/common/api/plusRequest';
 
 export const getFeishuAndYuqueDatasetFileList = async (data: {
   feishuServer?: FeishuServer;
   yuqueServer?: YuqueServer;
   parentId?: string;
-  nextPageToken?: string;
   pageSize: number;
   offset: number;
+  metaData?: Record<string, any>;
 }) => {
-  const res = await POST<GetApiDatasetFileListResponse>('/core/dataset/systemApiDataset', {
+  const res = await POST<APIFileListResponse>('/core/dataset/systemApiDataset', {
     type: 'list',
     ...data
   });

diff --git a/projects/app/src/web/core/dataset/api.ts b/projects/app/src/web/core/dataset/api.ts
@@ -57,14 +57,12 @@ import type { UpdateDatasetDataProps } from '@fastgpt/global/core/dataset/contro
 import type { DatasetFolderCreateBody } from '@/pages/api/core/dataset/folder/create';
 import type { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
 import type { GetScrollCollectionsProps } from '@/pages/api/core/dataset/collection/scrollList';
-import type {
-  GetApiDatasetFileListProps,
-  GetApiDatasetFileListResponse
-} from '@/pages/api/core/dataset/apiDataset/list';
+import type { GetApiDatasetFileListProps } from '@/pages/api/core/dataset/apiDataset/list';
 import type {
   listExistIdQuery,
   listExistIdResponse
 } from '@/pages/api/core/dataset/apiDataset/listExistId';
+import { APIFileListResponse } from '@fastgpt/global/core/dataset/apiDataset';
 
 /* ======================== dataset ======================= */
 export const getDatasets = (data: GetDatasetListBody) =>
@@ -224,6 +222,6 @@ export const getCollectionSource = (data: readCollectionSourceBody) =>
 
 /* ================== apiDataset ======================== */
 export const getApiDatasetFileList = (data: GetApiDatasetFileListProps) =>
-  POST<GetApiDatasetFileListResponse>('/core/dataset/apiDataset/list', data);
+  POST<APIFileListResponse>('/core/dataset/apiDataset/list', data);
 export const getApiDatasetFileListExistId = (data: listExistIdQuery) =>
   GET<listExistIdResponse>('/core/dataset/apiDataset/listExistId', data);