RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(web): use ConfirmDeleteDialog for reparse and parser-config confirmations (#21606)
chanx77b81f2a3606
diff --git a/web/src/pages/dataset/dataset/change-parser-dialog.test.tsx b/web/src/pages/dataset/dataset/change-parser-dialog.test.tsxindex 1854c82f7f..d0e44a2411 100644--- a/web/src/pages/dataset/dataset/change-parser-dialog.test.tsx+++ b/web/src/pages/dataset/dataset/change-parser-dialog.test.tsx@@ -1,5 +1,8 @@import { fireEvent, render, screen, waitFor } from '@testing-library/react';-import { ChangeParserDialog } from './change-parser-dialog';+import {+ ChangeParserDialog,+ ReparseConfirmDialog,+} from './change-parser-dialog';import { useChangeDocumentParser } from './use-change-document-parser';const mockSave = jest.fn().mockResolvedValue(0);@@ -138,6 +141,13 @@ function Harness({loading={state.changeParserLoading}/>)}+ {state.reparseVisible && (+ <ReparseConfirmDialog+ visible={state.reparseVisible}+ onOk={state.confirmReparse}+ onCancel={state.hideReparseModal}+ />+ )}</>);}diff --git a/web/src/pages/dataset/dataset/change-parser-dialog.tsx b/web/src/pages/dataset/dataset/change-parser-dialog.tsxindex 1021c6bef5..5ebba33f57 100644--- a/web/src/pages/dataset/dataset/change-parser-dialog.tsx+++ b/web/src/pages/dataset/dataset/change-parser-dialog.tsx@@ -1,6 +1,8 @@+import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';import { DocumentPipelineDialog } from '@/components/document-pipeline-dialog';import { IDocumentInfo } from '@/interfaces/database/document';import { IChangeParserRequestBody } from '@/interfaces/request/document';+import { useTranslation } from 'react-i18next';type ChangeParserDialogProps = {record: IDocumentInfo;@@ -28,3 +30,28 @@ export function ChangeParserDialog({></DocumentPipelineDialog>);}++// Shown after a parser-config save when the document already has chunks:+// confirm dropping them and re-parsing with the saved settings.+export function ReparseConfirmDialog({+ visible,+ onOk,+ onCancel,+}: {+ visible: boolean;+ onOk: () => void | Promise<void>;+ onCancel: () => void;+}) {+ const { t } = useTranslation();+ return (+ <ConfirmDeleteDialog+ open={visible}+ title={t('knowledgeDetails.parseFile')}+ content={{ title: t('knowledgeDetails.parserConfigReparseTip') }}+ okButtonText={t('common.yes')}+ cancelButtonText={t('common.no')}+ onOk={onOk}+ onCancel={onCancel}+ ></ConfirmDeleteDialog>+ );+}diff --git a/web/src/pages/dataset/dataset/dataset-table.tsx b/web/src/pages/dataset/dataset/dataset-table.tsxindex 15eb219bd6..be1685c335 100644--- a/web/src/pages/dataset/dataset/dataset-table.tsx+++ b/web/src/pages/dataset/dataset/dataset-table.tsx@@ -32,7 +32,10 @@ import { pick } from 'lodash';import { useMemo } from 'react';import { ShowManageMetadataModalProps } from '../components/metedata/interface';import ProcessLogModal from '../process-log-modal';-import { ChangeParserDialog } from './change-parser-dialog';+import {+ ChangeParserDialog,+ ReparseConfirmDialog,+} from './change-parser-dialog';import { useShowLog } from './hooks';import { useChangeDocumentParser } from './use-change-document-parser';import { useDatasetTableColumns } from './use-dataset-table-columns';@@ -70,6 +73,9 @@ export function DatasetTable({hideChangeParserModal,showChangeParserModal,changeParserRecord,+ reparseVisible,+ hideReparseModal,+ confirmReparse,} = useChangeDocumentParser();const {@@ -198,6 +204,14 @@ export function DatasetTable({/>)}+ {reparseVisible && (+ <ReparseConfirmDialog+ visible={reparseVisible}+ onOk={confirmReparse}+ onCancel={hideReparseModal}+ />+ )}+{renameVisible && (<RenameDialogvisible={renameVisible}diff --git a/web/src/pages/dataset/dataset/use-change-document-parser.ts b/web/src/pages/dataset/dataset/use-change-document-parser.tsindex 55ca8804ca..a26a04bee1 100644--- a/web/src/pages/dataset/dataset/use-change-document-parser.ts+++ b/web/src/pages/dataset/dataset/use-change-document-parser.ts@@ -1,4 +1,3 @@-import { Modal } from '@/components/ui/modal/modal';import { useSetModalState } from '@/hooks/common-hooks';import {useRunDocument,@@ -9,10 +8,8 @@ import { useQueryClient } from '@tanstack/react-query';import { IDocumentInfo } from '@/interfaces/database/document';import { IChangeParserRequestBody } from '@/interfaces/request/document';import { useCallback, useState } from 'react';-import { useTranslation } from 'react-i18next';export const useChangeDocumentParser = () => {- const { t } = useTranslation();const queryClient = useQueryClient();const { setDocumentPipelineParser, loading } = useSetDocumentPipelineParser();const { runDocumentByIds } = useRunDocument();@@ -24,6 +21,12 @@ export const useChangeDocumentParser = () => {showModal: showChangeParserModal,} = useSetModalState();+ const {+ visible: reparseVisible,+ hideModal: hideReparseModal,+ showModal: showReparseModal,+ } = useSetModalState();+const onChangeParserOk = useCallback(async (parserConfigInfo: IChangeParserRequestBody) => {if (record?.id && record?.dataset_id) {@@ -44,23 +47,7 @@ export const useChangeDocumentParser = () => {queryClient.invalidateQueries({ queryKey: DocumentKeys.all() });hideChangeParserModal();if (record.chunk_count > 0) {- Modal.confirm({- title: t('knowledgeDetails.parseFile'),- content: t('knowledgeDetails.parserConfigReparseTip'),- okText: t('common.yes'),- cancelText: t('common.no'),- onOk: async () => {- try {- await runDocumentByIds({- documentIds: [record.id],- run: 1,- option: { delete: true, apply_kb: false },- });- } catch (error) {- console.warn(error);- }- },- });+ showReparseModal();}}}@@ -69,13 +56,30 @@ export const useChangeDocumentParser = () => {record?.id,record?.dataset_id,record?.chunk_count,- runDocumentByIds,+ queryClient,setDocumentPipelineParser,hideChangeParserModal,- t,+ showReparseModal,],);+ // Chunks exist and the parser settings just changed, so ask before dropping+ // them and re-ingesting with the saved settings.+ const confirmReparse = useCallback(async () => {+ if (record?.id) {+ try {+ await runDocumentByIds({+ documentIds: [record.id],+ run: 1,+ option: { delete: true, apply_kb: false },+ });+ } catch (error) {+ console.warn(error);+ }+ }+ hideReparseModal();+ }, [record, runDocumentByIds, hideReparseModal]);+const handleShowChangeParserModal = useCallback((row: IDocumentInfo) => {setRecord(row);@@ -91,6 +95,9 @@ export const useChangeDocumentParser = () => {hideChangeParserModal,showChangeParserModal: handleShowChangeParserModal,changeParserRecord: record,+ reparseVisible,+ hideReparseModal,+ confirmReparse,};};diff --git a/web/src/pages/dataset/setting/apply-parser-config-dialog.tsx b/web/src/pages/dataset/setting/apply-parser-config-dialog.tsxindex 4176441f23..bc42cb7435 100644--- a/web/src/pages/dataset/setting/apply-parser-config-dialog.tsx+++ b/web/src/pages/dataset/setting/apply-parser-config-dialog.tsx@@ -1,13 +1,4 @@-import {- AlertDialog,- AlertDialogCancel,- AlertDialogContent,- AlertDialogDescription,- AlertDialogFooter,- AlertDialogHeader,- AlertDialogTitle,-} from '@/components/ui/alert-dialog';-import { ButtonLoading, buttonVariants } from '@/components/ui/button';+import { ConfirmDeleteDialog } from '@/components/confirm-delete-dialog';import message from '@/components/ui/message';import { useApplyDatasetParserConfig } from '@/hooks/use-apply-dataset-parser-config';import { useTranslation } from 'react-i18next';@@ -27,57 +18,44 @@ export function ApplyParserConfigDialog({const { mutateAsync, isPending, error, reset } =useApplyDatasetParserConfig(datasetId);- const handleOpenChange = (nextOpen: boolean) => {- if (isPending) return;+ const handleCancel = () => {+ if (isPending) {+ return;+ }reset();- onOpenChange(nextOpen);+ onOpenChange(false);};const handleApply = async () => {+ if (isPending) {+ return;+ }try {await mutateAsync();message.success(t('knowledgeConfiguration.parserSettingsApplied'));onOpenChange(false);} catch {- // Keep the saved-settings dialog open so Yes can retry the operation.+ // Keep the dialog open so Yes can retry the operation.}};return (- <AlertDialog open={open} onOpenChange={handleOpenChange}>- <AlertDialogContent className="bg-bg-base border-border-default">- <AlertDialogHeader>- <AlertDialogTitle>- {t('knowledgeConfiguration.applyParserSettingsTitle')}- </AlertDialogTitle>- <AlertDialogDescription>- {t('knowledgeConfiguration.parserSettingsChangeWarning')}- </AlertDialogDescription>- </AlertDialogHeader>- {error && (+ <ConfirmDeleteDialog+ open={open}+ title={t('knowledgeConfiguration.applyParserSettingsTitle')}+ content={{+ title: t('knowledgeConfiguration.parserSettingsChangeWarning'),+ node: error ? (<p role="alert" className="text-state-error text-sm">{t('knowledgeConfiguration.parserSettingsApplyFailed')}{' '}{error.message}</p>- )}- <AlertDialogFooter>- <ButtonLoading- type="button"- variant="outline"- loading={isPending}- disabled={isPending}- onClick={handleApply}- >- {t('common.yes')}- </ButtonLoading>- <AlertDialogCancel- className={buttonVariants({ variant: 'default' })}- disabled={isPending}- >- {t('common.no')}- </AlertDialogCancel>- </AlertDialogFooter>- </AlertDialogContent>- </AlertDialog>+ ) : null,+ }}+ okButtonText={t('common.yes')}+ cancelButtonText={t('common.no')}+ onOk={handleApply}+ onCancel={handleCancel}+ ></ConfirmDeleteDialog>);}