Merge branch 'main' into 3-23-update-ci

web/app/components/datasets/documents/detail/settings/__tests__/document-settings.spec.tsx

@@ -224,6 +224,20 @@ describe('DocumentSettings', () => {
 
   // Data source types
   describe('Data Source Types', () => {
+    it('should handle upload_file_id data source format', () => {
+      mockDocumentDetail = {
+        name: 'test-document',
+        data_source_type: 'upload_file',
+        data_source_info: {
+          upload_file_id: '4a807f05-45d6-4fc4-b7a8-b009a4568b36',
+        },
+      }
+
+      render(<DocumentSettings {...defaultProps} />)
+
+      expect(screen.getByTestId('files-count')).toHaveTextContent('1')
+    })
+
     it('should handle legacy upload_file data source', () => {
       mockDocumentDetail = {
         name: 'test-document',
@@ -307,6 +321,18 @@ describe('DocumentSettings', () => {
       expect(screen.getByTestId('files-count')).toHaveTextContent('0')
     })
 
+    it('should handle empty data_source_info object', () => {
+      mockDocumentDetail = {
+        name: 'test-document',
+        data_source_type: 'upload_file',
+        data_source_info: {},
+      }
+
+      render(<DocumentSettings {...defaultProps} />)
+
+      expect(screen.getByTestId('files-count')).toHaveTextContent('0')
+    })
+
     it('should maintain structure when rerendered', () => {
       const { rerender } = render(
         <DocumentSettings datasetId="dataset-1" documentId="doc-1" />,
@@ -317,4 +343,37 @@ describe('DocumentSettings', () => {
       expect(screen.getByTestId('step-two')).toBeInTheDocument()
     })
   })
+
+  describe('Files Extraction Regression Tests', () => {
+    it('should correctly extract file ID from upload_file_id format', () => {
+      const fileId = '4a807f05-45d6-4fc4-b7a8-b009a4568b36'
+      mockDocumentDetail = {
+        name: 'test-document.pdf',
+        data_source_type: 'upload_file',
+        data_source_info: {
+          upload_file_id: fileId,
+        },
+      }
+
+      render(<DocumentSettings {...defaultProps} />)
+
+      // Verify files array is populated with correct file ID
+      expect(screen.getByTestId('files-count')).toHaveTextContent('1')
+    })
+
+    it('should preserve document name when using upload_file_id format', () => {
+      const documentName = 'my-uploaded-document.txt'
+      mockDocumentDetail = {
+        name: documentName,
+        data_source_type: 'upload_file',
+        data_source_info: {
+          upload_file_id: 'some-file-id',
+        },
+      }
+
+      render(<DocumentSettings {...defaultProps} />)
+
+      expect(screen.getByTestId('files-count')).toHaveTextContent('1')
+    })
+  })
 })

web/app/components/datasets/documents/detail/settings/document-settings.tsx

@@ -8,6 +8,7 @@ import type {
   LegacyDataSourceInfo,
   LocalFileInfo,
   OnlineDocumentInfo,
+  UploadFileIdInfo,
   WebsiteCrawlInfo,
 } from '@/models/datasets'
 import { useBoolean } from 'ahooks'
@@ -61,6 +62,7 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => {
 
   const dataSourceInfo = documentDetail?.data_source_info
 
+  // Type guards for DataSourceInfo union
   const isLegacyDataSourceInfo = (info: DataSourceInfo | undefined): info is LegacyDataSourceInfo => {
     return !!info && 'upload_file' in info
   }
@@ -73,10 +75,15 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => {
   const isLocalFileInfo = (info: DataSourceInfo | undefined): info is LocalFileInfo => {
     return !!info && 'related_id' in info && 'transfer_method' in info
   }
+  const isUploadFileIdInfo = (info: DataSourceInfo | undefined): info is UploadFileIdInfo => {
+    return !!info && 'upload_file_id' in info
+  }
+
   const legacyInfo = isLegacyDataSourceInfo(dataSourceInfo) ? dataSourceInfo : undefined
   const websiteInfo = isWebsiteCrawlInfo(dataSourceInfo) ? dataSourceInfo : undefined
   const onlineDocumentInfo = isOnlineDocumentInfo(dataSourceInfo) ? dataSourceInfo : undefined
   const localFileInfo = isLocalFileInfo(dataSourceInfo) ? dataSourceInfo : undefined
+  const uploadFileIdInfo = isUploadFileIdInfo(dataSourceInfo) ? dataSourceInfo : undefined
 
   const currentPage = useMemo(() => {
     if (legacyInfo) {
@@ -101,8 +108,20 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => {
   }, [documentDetail?.data_source_type, documentDetail?.name, legacyInfo, onlineDocumentInfo])
 
   const files = useMemo<CustomFile[]>(() => {
-    if (legacyInfo?.upload_file)
-      return [legacyInfo.upload_file as CustomFile]
+    // Handle upload_file_id format
+    if (uploadFileIdInfo) {
+      return [{
+        id: uploadFileIdInfo.upload_file_id,
+        name: documentDetail?.name || '',
+      } as unknown as CustomFile]
+    }
+
+    // Handle legacy upload_file format
+    if (legacyInfo?.upload_file) {
+      return [legacyInfo.upload_file as unknown as CustomFile]
+    }
+
+    // Handle local file info format
     if (localFileInfo) {
       const { related_id, name, extension } = localFileInfo
       return [{
@@ -111,8 +130,9 @@ const DocumentSettings = ({ datasetId, documentId }: DocumentSettingsProps) => {
         extension,
       } as unknown as CustomFile]
     }
+
     return []
-  }, [legacyInfo?.upload_file, localFileInfo])
+  }, [uploadFileIdInfo, legacyInfo?.upload_file, localFileInfo, documentDetail?.name])
 
   const websitePages = useMemo(() => {
     if (!websiteInfo)

web/app/components/header/account-setting/__tests__/index.spec.tsx

@@ -315,14 +315,14 @@ describe('AccountSetting', () => {
     it('should handle scroll event in panel', () => {
       // Act
       renderAccountSetting()
-      const scrollContainer = screen.getByRole('dialog').querySelector('.overflow-y-auto')
+      const scrollContainer = screen.getByRole('dialog').querySelector('.overscroll-contain')
 
       // Assert
       expect(scrollContainer).toBeInTheDocument()
       if (scrollContainer) {
         // Scroll down
         fireEvent.scroll(scrollContainer, { target: { scrollTop: 100 } })
-        expect(scrollContainer).toHaveClass('overflow-y-auto')
+        expect(scrollContainer).toHaveClass('overscroll-contain')
 
         // Scroll back up
         fireEvent.scroll(scrollContainer, { target: { scrollTop: 0 } })

web/app/components/header/account-setting/index.tsx

@@ -1,8 +1,9 @@
 'use client'
 import type { AccountSettingTab } from '@/app/components/header/account-setting/constants'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import SearchInput from '@/app/components/base/search-input'
+import { ScrollArea } from '@/app/components/base/ui/scroll-area'
 import BillingPage from '@/app/components/billing/billing-page'
 import CustomPage from '@/app/components/custom/custom-page'
 import {
@@ -129,20 +130,6 @@ export default function AccountSetting({
       ],
     },
   ]
-  const scrollRef = useRef<HTMLDivElement>(null)
-  const [scrolled, setScrolled] = useState(false)
-  useEffect(() => {
-    const targetElement = scrollRef.current
-    const scrollHandle = (e: Event) => {
-      const userScrolled = (e.target as HTMLDivElement).scrollTop > 0
-      setScrolled(userScrolled)
-    }
-    targetElement?.addEventListener('scroll', scrollHandle)
-    return () => {
-      targetElement?.removeEventListener('scroll', scrollHandle)
-    }
-  }, [])
-
   const activeItem = [...menuItems[0].items, ...menuItems[1].items].find(item => item.key === activeMenu)
 
   const [searchValue, setSearchValue] = useState<string>('')
@@ -201,7 +188,7 @@ export default function AccountSetting({
             }
           </div>
         </div>
-        <div className="relative flex w-[824px]">
+        <div className="relative flex min-h-0 w-[824px]">
           <div className="fixed right-6 top-6 z-[9999] flex flex-col items-center">
             <Button
               variant="tertiary"
@@ -214,8 +201,14 @@ export default function AccountSetting({
             </Button>
             <div className="mt-1 text-text-tertiary system-2xs-medium-uppercase">ESC</div>
           </div>
-          <div ref={scrollRef} className="w-full overflow-y-auto bg-components-panel-bg pb-4">
-            <div className={cn('sticky top-0 z-20 mx-8 mb-[18px] flex items-center bg-components-panel-bg pb-2 pt-[27px]', scrolled && 'border-b border-divider-regular')}>
+          <ScrollArea
+            className="h-full min-h-0 flex-1 bg-components-panel-bg"
+            slotClassNames={{
+              viewport: 'overscroll-contain',
+              content: 'min-h-full pb-4',
+            }}
+          >
+            <div className="sticky top-0 z-20 mx-8 mb-[18px] flex items-center bg-components-panel-bg pb-2 pt-[27px]">
               <div className="shrink-0 text-text-primary title-2xl-semi-bold">
                 {activeItem?.name}
                 {activeItem?.description && (
@@ -241,7 +234,7 @@ export default function AccountSetting({
               {activeMenu === ACCOUNT_SETTING_TAB.CUSTOM && <CustomPage />}
               {activeMenu === ACCOUNT_SETTING_TAB.LANGUAGE && <LanguagePage />}
             </div>
-          </div>
+          </ScrollArea>
         </div>
       </div>
     </MenuDialog>

web/models/datasets.ts

@@ -381,7 +381,11 @@ export type OnlineDriveInfo = {
   type: 'file' | 'folder'
 }
 
-export type DataSourceInfo = LegacyDataSourceInfo | LocalFileInfo | OnlineDocumentInfo | WebsiteCrawlInfo
+export type UploadFileIdInfo = {
+  upload_file_id: string
+}
+
+export type DataSourceInfo = LegacyDataSourceInfo | LocalFileInfo | OnlineDocumentInfo | WebsiteCrawlInfo | UploadFileIdInfo
 
 export type InitialDocumentDetail = {
   id: string

web/service/knowledge/use-create-dataset.ts

@@ -91,11 +91,15 @@ const getFileIndexingEstimateParamsForFile = ({
   processRule,
   dataset_id,
 }: GetFileIndexingEstimateParamsOptionFile): IndexingEstimateParams => {
+  const fileIds = files
+    .map(file => file.id)
+    .filter((id): id is string => Boolean(id))
+
   return {
     info_list: {
       data_source_type: dataSourceType,
       file_info_list: {
-        file_ids: files.map(file => file.id) as string[],
+        file_ids: fileIds,
       },
     },
     indexing_technique: indexingTechnique,