Merge branch 'feat/parent-child-retrieval' of https://github.com/langgenius/dify into feat/parent-child-retrieval

web/app/components/datasets/documents/detail/completed/batch-action.tsx

@@ -12,7 +12,7 @@ type IBatchActionProps = {
   selectedIds: string[]
   onBatchEnable: () => void
   onBatchDisable: () => void
-  onBatchDelete: () => void
+  onBatchDelete: () => Promise<void>
   onArchive?: () => void
   onCancel: () => void
 }
@@ -31,6 +31,15 @@ const BatchAction: FC<IBatchActionProps> = ({
     setTrue: showDeleteConfirm,
     setFalse: hideDeleteConfirm,
   }] = useBoolean(false)
+  const [isDeleting, {
+    setTrue: setIsDeleting,
+  }] = useBoolean(false)
+
+  const handleBatchDelete = async () => {
+    setIsDeleting()
+    await onBatchDelete()
+    hideDeleteConfirm()
+  }
   return (
     <div className={classNames('w-full flex justify-center gap-x-2', className)}>
       <div className='flex items-center gap-x-1 p-1 rounded-[10px] bg-components-actionbar-bg-accent border border-components-actionbar-border-accent shadow-xl shadow-shadow-shadow-5 backdrop-blur-[5px]'>
@@ -80,11 +89,10 @@ const BatchAction: FC<IBatchActionProps> = ({
             title={t('datasetDocuments.list.delete.title')}
             content={t('datasetDocuments.list.delete.content')}
             confirmText={t('common.operation.sure')}
-            onConfirm={() => {
-              onBatchDelete()
-              hideDeleteConfirm()
-            }}
+            onConfirm={handleBatchDelete}
             onCancel={hideDeleteConfirm}
+            isLoading={isDeleting}
+            isDisabled={isDeleting}
           />
         )
       }

web/service/knowledge/use-document.ts

@@ -59,7 +59,7 @@ export const useDocumentUnArchive = () => {
 export const useDocumentDelete = () => {
   return useMutation({
     mutationFn: ({ datasetId, documentIds, documentId }: UpdateDocumentBatchParams) => {
-      return del<CommonResponse>(`/datasets/${datasetId}/documents/batch?${toBatchDocumentsIdParams(documentId || documentIds!)}`)
+      return del<CommonResponse>(`/datasets/${datasetId}/documents?${toBatchDocumentsIdParams(documentId || documentIds!)}`)
     },
   })
 }