From 7b9a3c1084fb6c182d3a4de680b9b0049c46642a Mon Sep 17 00:00:00 2001 From: twwu Date: Wed, 11 Jun 2025 17:42:45 +0800 Subject: [PATCH 1/3] fix: update translation keys for document availability messages in English and Chinese --- web/app/components/datasets/list/dataset-card/index.tsx | 2 +- web/i18n/en-US/dataset.ts | 2 +- web/i18n/zh-Hans/dataset.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/app/components/datasets/list/dataset-card/index.tsx b/web/app/components/datasets/list/dataset-card/index.tsx index 88204db029..d7d9a9f79a 100644 --- a/web/app/components/datasets/list/dataset-card/index.tsx +++ b/web/app/components/datasets/list/dataset-card/index.tsx @@ -73,7 +73,7 @@ const DatasetCard = ({ 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 }) + return t('dataset.partialEnabled', { count: dataset.document_count, num: availableDocCount }) }, [t, dataset.document_count, dataset.total_available_documents]) const language = useGetLanguage() diff --git a/web/i18n/en-US/dataset.ts b/web/i18n/en-US/dataset.ts index 5eeebd3a1c..0ae99eaad7 100644 --- a/web/i18n/en-US/dataset.ts +++ b/web/i18n/en-US/dataset.ts @@ -25,7 +25,7 @@ const translation = { externalKnowledgeBase: 'External Knowledge Base', localDocs: 'Local Docs', documentCount: ' docs', - docAllEnabled_one: 'All {{count}} document enabled', + docAllEnabled_one: '{{count}} document enabled', docAllEnabled_other: 'All {{count}} documents enabled', partialEnabled_one: 'Total of {{count}} document, {{num}} available', partialEnabled_other: 'Total of {{count}} documents, {{num}} available', diff --git a/web/i18n/zh-Hans/dataset.ts b/web/i18n/zh-Hans/dataset.ts index 8102ffe2fe..f0c364f74a 100644 --- a/web/i18n/zh-Hans/dataset.ts +++ b/web/i18n/zh-Hans/dataset.ts @@ -25,7 +25,7 @@ const translation = { externalKnowledgeBase: '外部知识库', localDocs: '本地文档', documentCount: ' 文档', - docAllEnabled_one: '所有 {{count}} 个文档均可用', + docAllEnabled_one: '{{count}} 个文档可用', docAllEnabled_other: '所有 {{count}} 个文档均可用', partialEnabled_one: '共计 {{count}} 个文档, {{num}} 可用', partialEnabled_other: '共计 {{count}} 个文档, {{num}} 可用', From e52c905aa55a03cf43bcb0314aa54950485f95b9 Mon Sep 17 00:00:00 2001 From: twwu Date: Wed, 11 Jun 2025 17:46:50 +0800 Subject: [PATCH 2/3] refactor: improve layout-main component structure and readability --- .../[datasetId]/layout-main.tsx | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx index 43907718f3..f0db548bcd 100644 --- a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx +++ b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx @@ -149,22 +149,26 @@ const DatasetDetailLayout: FC = (props) => { ] if (datasetRes?.provider !== 'external') { - baseNavigation.unshift(...[{ + if (datasetRes?.pipeline_id) { + baseNavigation.unshift({ + name: t('common.datasetMenus.pipeline'), + href: `/datasets/${datasetId}/pipeline`, + icon: PipelineLine as RemixiconComponentType, + selectedIcon: PipelineFill as RemixiconComponentType, + disabled: false, + }) + } + baseNavigation.unshift({ name: t('common.datasetMenus.documents'), href: `/datasets/${datasetId}/documents`, icon: RiFileTextLine, selectedIcon: RiFileTextFill, disabled: isButtonDisabledWithPipeline, - }, { - name: t('common.datasetMenus.pipeline'), - href: `/datasets/${datasetId}/pipeline`, - icon: PipelineLine as RemixiconComponentType, - selectedIcon: PipelineFill as RemixiconComponentType, - disabled: false, - }]) + }) } + return baseNavigation - }, [t, datasetId, isButtonDisabledWithPipeline, datasetRes?.provider]) + }, [t, datasetId, isButtonDisabledWithPipeline, datasetRes?.provider, datasetRes?.pipeline_id]) useDocumentTitle(datasetRes?.name || t('common.menus.datasets')) From 5c41922b8a9274b85267ff32a4e2f221c1124d42 Mon Sep 17 00:00:00 2001 From: twwu Date: Wed, 11 Jun 2025 18:11:38 +0800 Subject: [PATCH 3/3] fix: update file extension for downloaded DSL files and refine mutation keys for template operations --- .../create-from-pipeline/list/template-card/index.tsx | 2 +- web/service/use-pipeline.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx index a8d4081993..e3e710a0a9 100644 --- a/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx +++ b/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx @@ -108,7 +108,7 @@ const TemplateCard = ({ const blob = new Blob([res.data], { type: 'application/yaml' }) downloadFile({ data: blob, - fileName: `${pipeline.name}.dsl`, + fileName: `${pipeline.name}.yml`, }) Toast.notify({ type: 'success', diff --git a/web/service/use-pipeline.ts b/web/service/use-pipeline.ts index e45d705e4c..10b76d1a54 100644 --- a/web/service/use-pipeline.ts +++ b/web/service/use-pipeline.ts @@ -33,7 +33,7 @@ import type { IconInfo } from '@/models/datasets' const NAME_SPACE = 'pipeline' -export const PipelineTemplateListQueryKeyPrefix = [NAME_SPACE, 'template', 'list'] +export const PipelineTemplateListQueryKeyPrefix = [NAME_SPACE, 'template-list'] export const usePipelineTemplateList = (params: PipelineTemplateListParams) => { return useQuery({ queryKey: [...PipelineTemplateListQueryKeyPrefix, params.type], @@ -62,7 +62,7 @@ export const useUpdateTemplateInfo = ( mutationOptions: MutationOptions = {}, ) => { return useMutation({ - mutationKey: [NAME_SPACE, 'template', 'update'], + mutationKey: [NAME_SPACE, 'template-update'], mutationFn: (request: UpdateTemplateInfoRequest) => { const { template_id, ...rest } = request return patch(`/rag/pipeline/customized/templates/${template_id}`, { @@ -77,7 +77,7 @@ export const useDeleteTemplate = ( mutationOptions: MutationOptions = {}, ) => { return useMutation({ - mutationKey: [NAME_SPACE, 'template', 'delete'], + mutationKey: [NAME_SPACE, 'template-delete'], mutationFn: (templateId: string) => { return del(`/rag/pipeline/customized/templates/${templateId}`) }, @@ -89,7 +89,7 @@ export const useExportTemplateDSL = ( mutationOptions: MutationOptions = {}, ) => { return useMutation({ - mutationKey: [NAME_SPACE, 'dsl-export'], + mutationKey: [NAME_SPACE, 'template-dsl-export'], mutationFn: (templateId: string) => { return post(`/rag/pipeline/customized/templates/${templateId}`) },