From 4b11d29ede5dd99ec980d269901d8e9e92f92cd7 Mon Sep 17 00:00:00 2001 From: twwu Date: Fri, 13 Jun 2025 15:57:16 +0800 Subject: [PATCH 1/3] fix: update VAR_TYPE_MAP and initialData handling in useConfigurations for improved variable processing --- .../process-documents/hooks.ts | 30 +++++++++++-------- .../test-run/document-processing/hooks.ts | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/web/app/components/datasets/documents/create-from-pipeline/process-documents/hooks.ts b/web/app/components/datasets/documents/create-from-pipeline/process-documents/hooks.ts index 7701d9b04e..8115391e26 100644 --- a/web/app/components/datasets/documents/create-from-pipeline/process-documents/hooks.ts +++ b/web/app/components/datasets/documents/create-from-pipeline/process-documents/hooks.ts @@ -4,12 +4,13 @@ import { usePublishedPipelineProcessingParams } from '@/service/use-pipeline' import { PipelineInputVarType } from '@/models/pipeline' import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail' -type PartialInputVarType = PipelineInputVarType.textInput | PipelineInputVarType.number | PipelineInputVarType.select | PipelineInputVarType.checkbox - -const VAR_TYPE_MAP: Record = { +const VAR_TYPE_MAP: Record = { [PipelineInputVarType.textInput]: BaseFieldType.textInput, - [PipelineInputVarType.number]: BaseFieldType.numberInput, + [PipelineInputVarType.paragraph]: BaseFieldType.paragraph, [PipelineInputVarType.select]: BaseFieldType.select, + [PipelineInputVarType.singleFile]: BaseFieldType.file, + [PipelineInputVarType.multiFiles]: BaseFieldType.fileList, + [PipelineInputVarType.number]: BaseFieldType.numberInput, [PipelineInputVarType.checkbox]: BaseFieldType.checkbox, } @@ -23,15 +24,15 @@ export const useConfigurations = (datasourceNodeId: string) => { const initialData = useMemo(() => { const variables = paramsConfig?.variables || [] return variables.reduce((acc, item) => { - const type = VAR_TYPE_MAP[item.type as PartialInputVarType] - if (type === BaseFieldType.textInput) - acc[item.variable] = '' + const type = VAR_TYPE_MAP[item.type] + if ([BaseFieldType.textInput, BaseFieldType.paragraph, BaseFieldType.select].includes(type)) + acc[item.variable] = item.default_value ?? '' if (type === BaseFieldType.numberInput) - acc[item.variable] = 0 - if (type === BaseFieldType.select) - acc[item.variable] = item.options?.[0] || '' + acc[item.variable] = item.default_value ?? 0 if (type === BaseFieldType.checkbox) acc[item.variable] = true + if ([BaseFieldType.file, BaseFieldType.fileList].includes(type)) + acc[item.variable] = [] return acc }, {} as Record) }, [paramsConfig]) @@ -39,7 +40,7 @@ export const useConfigurations = (datasourceNodeId: string) => { const configurations = useMemo(() => { const variables = paramsConfig?.variables || [] const configs = variables.map(item => ({ - type: VAR_TYPE_MAP[item.type as PartialInputVarType], + type: VAR_TYPE_MAP[item.type], variable: item.variable, label: item.label, required: item.required, @@ -49,7 +50,12 @@ export const useConfigurations = (datasourceNodeId: string) => { value: option, })), showConditions: [], - default: item.default_value, + placeholder: item.placeholder, + tooltip: item.tooltips, + unit: item.unit, + allowedFileTypes: item.allowed_file_types, + allowedFileExtensions: item.allowed_file_extensions, + allowedFileUploadMethods: item.allowed_file_upload_methods, })) return configs }, [paramsConfig]) diff --git a/web/app/components/rag-pipeline/components/panel/test-run/document-processing/hooks.ts b/web/app/components/rag-pipeline/components/panel/test-run/document-processing/hooks.ts index fecb355e46..344bc7a05d 100644 --- a/web/app/components/rag-pipeline/components/panel/test-run/document-processing/hooks.ts +++ b/web/app/components/rag-pipeline/components/panel/test-run/document-processing/hooks.ts @@ -14,6 +14,7 @@ const VAR_TYPE_MAP: Record = { [PipelineInputVarType.number]: BaseFieldType.numberInput, [PipelineInputVarType.checkbox]: BaseFieldType.checkbox, } + export const useConfigurations = (datasourceNodeId: string) => { const pipelineId = useStore(state => state.pipelineId) const { data: paramsConfig } = useDraftPipelineProcessingParams({ @@ -50,7 +51,6 @@ export const useConfigurations = (datasourceNodeId: string) => { value: option, })), showConditions: [], - default: item.default_value, placeholder: item.placeholder, tooltip: item.tooltips, unit: item.unit, From 55906c8375fd06d74ef1620b37b798f269354e9a Mon Sep 17 00:00:00 2001 From: twwu Date: Fri, 13 Jun 2025 18:01:01 +0800 Subject: [PATCH 2/3] fix: remove unused billing plan logic from CreateFromDSLModal component --- .../create-from-dsl-modal/index.tsx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx index 5f6b2b077f..75ffe49feb 100644 --- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx +++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx @@ -12,8 +12,6 @@ import { DSLImportMode, DSLImportStatus, } from '@/models/app' -import { useProviderContextSelector } from '@/context/provider-context' -import AppsFull from '@/app/components/billing/apps-full-in-dialog' import { usePluginDependencies } from '@/app/components/workflow/plugin-dependency/hooks' import { noop } from 'lodash-es' import Uploader from './uploader' @@ -70,9 +68,10 @@ const CreateFromDSLModal = ({ setFileContent('') } - const plan = useProviderContextSelector(state => state.plan) - const enableBilling = useProviderContextSelector(state => state.enableBilling) - const isAppsFull = (enableBilling && plan.usage.buildApps >= plan.total.buildApps) + // todo: TBD billing plan + // const plan = useProviderContextSelector(state => state.plan) + // const enableBilling = useProviderContextSelector(state => state.enableBilling) + // const isAppsFull = (enableBilling && plan.usage.buildApps >= plan.total.buildApps) const isCreatingRef = useRef(false) @@ -182,14 +181,12 @@ const CreateFromDSLModal = ({ } const buttonDisabled = useMemo(() => { - if (isAppsFull) - return true if (currentTab === CreateFromDSLModalTab.FROM_FILE) return !currentFile if (currentTab === CreateFromDSLModalTab.FROM_URL) return !dslUrlValue return false - }, [isAppsFull, currentTab, currentFile, dslUrlValue]) + }, [currentTab, currentFile, dslUrlValue]) return ( <> @@ -226,11 +223,6 @@ const CreateFromDSLModal = ({ ) } - {isAppsFull && ( -
- -
- )}