diff --git a/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx b/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx index 78dda7bbb6..900ab3fb5a 100644 --- a/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx +++ b/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx @@ -3,8 +3,9 @@ import { RiArchive2Line, RiCheckboxCircleLine, RiCloseCircleLine, RiDeleteBinLin import { useTranslation } from 'react-i18next' import { useBoolean } from 'ahooks' import Divider from '@/app/components/base/divider' -import classNames from '@/utils/classnames' +import cn from '@/utils/classnames' import Confirm from '@/app/components/base/confirm' +import Button from '@/app/components/base/button' const i18nPrefix = 'dataset.batchAction' type IBatchActionProps = { @@ -43,55 +44,70 @@ const BatchAction: FC = ({ hideDeleteConfirm() } return ( -
-
+
+
- + {selectedIds.length} - {t(`${i18nPrefix}.selected`)} + {t(`${i18nPrefix}.selected`)}
-
- - -
-
- - -
+ + {onEditMetadata && ( -
- - -
+ )} {onArchive && ( -
- - -
+ )} -
- - -
+ - +
{ isShowDeleteConfirm && ( diff --git a/web/app/components/datasets/list/dataset-card/index.tsx b/web/app/components/datasets/list/dataset-card/index.tsx index cd3b7f1eec..88204db029 100644 --- a/web/app/components/datasets/list/dataset-card/index.tsx +++ b/web/app/components/datasets/list/dataset-card/index.tsx @@ -62,19 +62,19 @@ const DatasetCard = ({ } const { formatIndexingTechniqueAndMethod } = useKnowledge() const documentCount = useMemo(() => { - const availableDocCount = dataset.available_document_count || dataset.document_count + const availableDocCount = dataset.total_available_documents ?? 0 if (availableDocCount === dataset.document_count) return `${dataset.document_count}` if (availableDocCount < dataset.document_count) return `${availableDocCount} / ${dataset.document_count}` - }, [dataset.document_count, dataset.available_document_count]) + }, [dataset.document_count, dataset.total_available_documents]) const documentCountTooltip = useMemo(() => { - const availableDocCount = dataset.available_document_count || dataset.document_count + const availableDocCount = dataset.total_available_documents ?? 0 if (availableDocCount === dataset.document_count) return t('dataset.docAllEnabled', { count: availableDocCount }) if (availableDocCount < dataset.document_count) return t('dataset.docAllEnabled', { count: dataset.document_count, num: availableDocCount }) - }, [t, dataset.document_count, dataset.available_document_count]) + }, [t, dataset.document_count, dataset.total_available_documents]) const language = useGetLanguage() const formatTimeFromNow = useCallback((time: number) => { diff --git a/web/models/datasets.ts b/web/models/datasets.ts index 8a49a2b675..965eb8a709 100644 --- a/web/models/datasets.ts +++ b/web/models/datasets.ts @@ -56,7 +56,7 @@ export type DataSet = { doc_form: ChunkingMode document_count: number total_document_count: number - available_document_count?: number + total_available_documents?: number word_count: number provider: string embedding_model: string