From c8614b108a56de1704c1c8477ad0591edc7ed028 Mon Sep 17 00:00:00 2001 From: twwu Date: Tue, 9 Sep 2025 15:35:02 +0800 Subject: [PATCH] refactor: replace useResetDatasetList with useInvalidDatasetList across multiple components --- .../components/app-sidebar/dataset-info/dropdown.tsx | 12 ++++++------ .../datasets/create-from-pipeline/footer.tsx | 8 ++++---- .../create-from-pipeline/list/create-card.tsx | 8 ++++---- .../list/template-card/index.tsx | 8 ++++---- .../create/empty-dataset-creation-modal/index.tsx | 6 +++--- .../components/datasets/create/step-two/index.tsx | 6 +++--- web/app/components/datasets/list/datasets.tsx | 6 +++--- web/app/components/datasets/settings/form/index.tsx | 6 +++--- .../rag-pipeline-header/publisher/popup.tsx | 10 ++++------ web/service/knowledge/use-dataset.ts | 6 +++--- 10 files changed, 37 insertions(+), 39 deletions(-) diff --git a/web/app/components/app-sidebar/dataset-info/dropdown.tsx b/web/app/components/app-sidebar/dataset-info/dropdown.tsx index 25967cd039..cecfcbabb9 100644 --- a/web/app/components/app-sidebar/dataset-info/dropdown.tsx +++ b/web/app/components/app-sidebar/dataset-info/dropdown.tsx @@ -7,7 +7,7 @@ import Menu from './menu' import { useSelector as useAppContextWithSelector } from '@/context/app-context' import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail' import type { DataSet } from '@/models/datasets' -import { datasetDetailQueryKeyPrefix, useResetDatasetList } from '@/service/knowledge/use-dataset' +import { datasetDetailQueryKeyPrefix, useInvalidDatasetList } from '@/service/knowledge/use-dataset' import { useInvalid } from '@/service/use-base' import { useExportPipelineDSL } from '@/service/use-pipeline' import Toast from '../../base/toast' @@ -38,13 +38,13 @@ const DropDown = ({ setOpen(prev => !prev) }, []) - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const invalidDatasetDetail = useInvalid([...datasetDetailQueryKeyPrefix, dataset.id]) const refreshDataset = useCallback(() => { - resetDatasetList() + invalidDatasetList() invalidDatasetDetail() - }, [invalidDatasetDetail, resetDatasetList]) + }, [invalidDatasetDetail, invalidDatasetList]) const openRenameModal = useCallback(() => { setShowRenameModal(true) @@ -93,13 +93,13 @@ const DropDown = ({ try { await deleteDataset(dataset.id) Toast.notify({ type: 'success', message: t('dataset.datasetDeleted') }) - resetDatasetList() + invalidDatasetList() replace('/datasets') } finally { setShowConfirmDelete(false) } - }, [dataset.id, replace, resetDatasetList, t]) + }, [dataset.id, replace, invalidDatasetList, t]) return ( { const { t } = useTranslation() @@ -14,7 +14,7 @@ const Footer = () => { const searchParams = useSearchParams() const { replace } = useRouter() const dslUrl = searchParams.get('remoteInstallUrl') || undefined - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const activeTab = useMemo(() => { if (dslUrl) @@ -34,8 +34,8 @@ const Footer = () => { }, [dslUrl, replace]) const onImportFromDSLSuccess = useCallback(() => { - resetDatasetList() - }, [resetDatasetList]) + invalidDatasetList() + }, [invalidDatasetList]) return (
diff --git a/web/app/components/datasets/create-from-pipeline/list/create-card.tsx b/web/app/components/datasets/create-from-pipeline/list/create-card.tsx index 221ea5f0fc..43c6da0dfc 100644 --- a/web/app/components/datasets/create-from-pipeline/list/create-card.tsx +++ b/web/app/components/datasets/create-from-pipeline/list/create-card.tsx @@ -2,7 +2,7 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' import { RiAddCircleLine } from '@remixicon/react' import { useCreatePipelineDataset } from '@/service/knowledge/use-create-dataset' -import { useResetDatasetList } from '@/service/knowledge/use-dataset' +import { useInvalidDatasetList } from '@/service/knowledge/use-dataset' import Toast from '@/app/components/base/toast' import { useRouter } from 'next/navigation' @@ -11,7 +11,7 @@ const CreateCard = () => { const { push } = useRouter() const { mutateAsync: createEmptyDataset } = useCreatePipelineDataset() - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const handleCreate = useCallback(async () => { await createEmptyDataset(undefined, { @@ -22,7 +22,7 @@ const CreateCard = () => { type: 'success', message: t('datasetPipeline.creation.successTip'), }) - resetDatasetList() + invalidDatasetList() push(`/datasets/${id}/pipeline`) } }, @@ -33,7 +33,7 @@ const CreateCard = () => { }) }, }) - }, [createEmptyDataset, push, resetDatasetList, t]) + }, [createEmptyDataset, push, invalidDatasetList, t]) return (
{ const { data: pipelineTemplateInfo } = await getPipelineTemplateInfo() @@ -64,7 +64,7 @@ const TemplateCard = ({ type: 'success', message: t('datasetPipeline.creation.successTip'), }) - resetDatasetList() + invalidDatasetList() if (newDataset.pipeline_id) await handleCheckPluginDependencies(newDataset.pipeline_id, true) push(`/datasets/${newDataset.dataset_id}/pipeline`) @@ -76,7 +76,7 @@ const TemplateCard = ({ }) }, }) - }, [getPipelineTemplateInfo, createDataset, t, handleCheckPluginDependencies, push, resetDatasetList]) + }, [getPipelineTemplateInfo, createDataset, t, handleCheckPluginDependencies, push, invalidDatasetList]) const handleShowTemplateDetails = useCallback(() => { setShowDetailModal(true) diff --git a/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx b/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx index d2a3235d35..12b9366744 100644 --- a/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx +++ b/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx @@ -11,7 +11,7 @@ import Button from '@/app/components/base/button' import { ToastContext } from '@/app/components/base/toast' import { createEmptyDataset } from '@/service/datasets' -import { useResetDatasetList } from '@/service/knowledge/use-dataset' +import { useInvalidDatasetList } from '@/service/knowledge/use-dataset' type IProps = { show: boolean @@ -26,7 +26,7 @@ const EmptyDatasetCreationModal = ({ const { t } = useTranslation() const { notify } = useContext(ToastContext) const router = useRouter() - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const submit = async () => { if (!inputValue) { @@ -39,7 +39,7 @@ const EmptyDatasetCreationModal = ({ } try { const dataset = await createEmptyDataset({ name: inputValue }) - resetDatasetList() + invalidDatasetList() onHide() router.push(`/datasets/${dataset.id}/documents`) } diff --git a/web/app/components/datasets/create/step-two/index.tsx b/web/app/components/datasets/create/step-two/index.tsx index 627f84ad7d..650dc9425a 100644 --- a/web/app/components/datasets/create/step-two/index.tsx +++ b/web/app/components/datasets/create/step-two/index.tsx @@ -62,7 +62,7 @@ import CustomDialog from '@/app/components/base/dialog' import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback' import { noop } from 'lodash-es' import { useDocLink } from '@/context/i18n' -import { useResetDatasetList } from '@/service/knowledge/use-dataset' +import { useInvalidDatasetList } from '@/service/knowledge/use-dataset' const TextLabel: FC = (props) => { return @@ -556,7 +556,7 @@ const StepTwo = ({ }) const isCreating = createFirstDocumentMutation.isPending || createDocumentMutation.isPending - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const createHandle = async () => { const params = getCreationParams() @@ -586,7 +586,7 @@ const StepTwo = ({ } if (mutateDatasetRes) mutateDatasetRes() - resetDatasetList() + invalidDatasetList() onStepChange && onStepChange(+1) isSetting && onSave && onSave() } diff --git a/web/app/components/datasets/list/datasets.tsx b/web/app/components/datasets/list/datasets.tsx index 5602730296..beb4e591e1 100644 --- a/web/app/components/datasets/list/datasets.tsx +++ b/web/app/components/datasets/list/datasets.tsx @@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next' import NewDatasetCard from './new-dataset-card' import DatasetCard from './dataset-card' import { useSelector as useAppContextWithSelector } from '@/context/app-context' -import { useDatasetList, useResetDatasetList } from '@/service/knowledge/use-dataset' +import { useDatasetList, useInvalidDatasetList } from '@/service/knowledge/use-dataset' type Props = { tags: string[] @@ -32,7 +32,7 @@ const Datasets = ({ include_all: includeAll, keyword: keywords, }) - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const anchorRef = useRef(null) const observerRef = useRef(null) @@ -58,7 +58,7 @@ const Datasets = ({ diff --git a/web/app/components/datasets/settings/form/index.tsx b/web/app/components/datasets/settings/form/index.tsx index e9a6270301..c6a5da9699 100644 --- a/web/app/components/datasets/settings/form/index.tsx +++ b/web/app/components/datasets/settings/form/index.tsx @@ -36,7 +36,7 @@ import ChunkStructure from '../chunk-structure' import Toast from '@/app/components/base/toast' import { RiAlertFill } from '@remixicon/react' import { useDocLink } from '@/context/i18n' -import { useResetDatasetList } from '@/service/knowledge/use-dataset' +import { useInvalidDatasetList } from '@/service/knowledge/use-dataset' const rowClass = 'flex gap-x-1' const labelClass = 'flex items-center shrink-0 w-[180px] h-7 pt-1' @@ -127,7 +127,7 @@ const Form = () => { getMembers() }) - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const handleSave = async () => { if (loading) return @@ -190,7 +190,7 @@ const Form = () => { Toast.notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') }) if (mutateDatasets) { await mutateDatasets() - resetDatasetList() + invalidDatasetList() } } catch { diff --git a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx index 6e0fdc50ee..66109a26ce 100644 --- a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx +++ b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx @@ -38,7 +38,7 @@ import { import Confirm from '@/app/components/base/confirm' import PublishAsKnowledgePipelineModal from '../../publish-as-knowledge-pipeline-modal' import type { IconInfo } from '@/models/datasets' -import { useResetDatasetList } from '@/service/knowledge/use-dataset' +import { useInvalidDatasetList } from '@/service/knowledge/use-dataset' import { useProviderContext } from '@/context/provider-context' import classNames from '@/utils/classnames' import PremiumBadge from '@/app/components/base/premium-badge' @@ -86,7 +86,7 @@ const Popup = () => { }] = useBoolean(false) const invalidPublishedPipelineInfo = useInvalid([...publishedPipelineInfoQueryKeyPrefix, pipelineId]) - const resetDatasetList = useResetDatasetList() + const invalidDatasetList = useInvalidDatasetList() const handlePublish = useCallback(async (params?: PublishWorkflowParams) => { if (publishing) @@ -130,7 +130,7 @@ const Popup = () => { workflowStore.getState().setPublishedAt(res.created_at) mutateDatasetRes?.() invalidPublishedPipelineInfo() - resetDatasetList() + invalidDatasetList() } } } @@ -150,9 +150,7 @@ const Popup = () => { if (published) return handlePublish() - }, - { exactMatch: true, useCapture: true }, - ) + }, { exactMatch: true, useCapture: true }) const goToAddDocuments = useCallback(() => { push(`/datasets/${datasetId}/documents/create-from-pipeline`) diff --git a/web/service/knowledge/use-dataset.ts b/web/service/knowledge/use-dataset.ts index 626c24381a..5a9a7576f5 100644 --- a/web/service/knowledge/use-dataset.ts +++ b/web/service/knowledge/use-dataset.ts @@ -10,7 +10,7 @@ import type { RelatedAppResponse, } from '@/models/datasets' import { get } from '../base' -import { useReset } from '../use-base' +import { useInvalid } from '../use-base' import qs from 'qs' const NAME_SPACE = 'dataset' @@ -36,8 +36,8 @@ export const useDatasetList = (params: DatasetListRequest) => { }) } -export const useResetDatasetList = () => { - return useReset([...DatasetListKey]) +export const useInvalidDatasetList = () => { + return useInvalid([...DatasetListKey]) } export const datasetDetailQueryKeyPrefix = [NAME_SPACE, 'detail']