Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix: test data source connection need connector name (#18495)

Haruko38688a72e6a367b
diff --git a/web/src/pages/user-setting/data-source/add-datasource-modal.tsx b/web/src/pages/user-setting/data-source/add-datasource-modal.tsx
index 1d490ce229..f1a3dce0fc 100644
--- a/web/src/pages/user-setting/data-source/add-datasource-modal.tsx
+++ b/web/src/pages/user-setting/data-source/add-datasource-modal.tsx
@@ -44,10 +44,6 @@ const AddDataSourceModal = ({
}: IModalProps<FieldValues> & { sourceData?: IDataSorceInfo }) => {
const { t } = useTranslation();
const formRef = useRef<DynamicFormRef>(null);
- const { loading: testLoading, handleTest } = useTestDataSource(
- formRef,
- sourceData?.id,
- );
const fields = useMemo<FormFieldConfig[]>(() => {
if (!sourceData) {
return [];
@@ -57,6 +53,11 @@ const AddDataSourceModal = ({
...getDataSourceFieldsWithExtras(t, sourceData.id as any),
] as FormFieldConfig[];
}, [sourceData, t]);
+ const { loading: testLoading, handleTest } = useTestDataSource(
+ formRef,
+ sourceData?.id,
+ fields,
+ );
const defaultValues = useMemo<FieldValues>(
() =>
diff --git a/web/src/pages/user-setting/data-source/data-source-detail-page/index.tsx b/web/src/pages/user-setting/data-source/data-source-detail-page/index.tsx
index bf41740e27..f7cb6d42a9 100644
--- a/web/src/pages/user-setting/data-source/data-source-detail-page/index.tsx
+++ b/web/src/pages/user-setting/data-source/data-source-detail-page/index.tsx
@@ -163,6 +163,7 @@ const SourceDetailPage = () => {
const { loading: testLoading, handleTest } = useTestDataSource(
formRef,
connectorId,
+ fields,
);
const onSubmit = useCallback(() => {
diff --git a/web/src/pages/user-setting/data-source/hooks.ts b/web/src/pages/user-setting/data-source/hooks.ts
index ca69b0a26b..206400f80f 100644
--- a/web/src/pages/user-setting/data-source/hooks.ts
+++ b/web/src/pages/user-setting/data-source/hooks.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { DynamicFormRef } from '@/components/dynamic-form';
+import { DynamicFormRef, FormFieldConfig } from '@/components/dynamic-form';
import message from '@/components/ui/message';
import { RunningStatus } from '@/constants/knowledge';
import { useSetModalState } from '@/hooks/common-hooks';
@@ -292,6 +292,7 @@ export const useDataSourceRebuild = () => {
export const useTestDataSource = (
formRef: RefObject<DynamicFormRef | null>,
connectorId?: string,
+ fields: FormFieldConfig[] = [],
) => {
const [currentQueryParameters] = useSearchParams();
const id = currentQueryParameters.get('id');
@@ -303,7 +304,17 @@ export const useTestDataSource = (
const connectorID = id || values?.id || connectorId || source;
if (!connectorID || !source) return;
- const isValid = await formRef.current?.trigger();
+ const fieldNames = fields
+ .filter((field) => {
+ if (field.name === 'id' || field.name === 'name') {
+ return false;
+ }
+ return !field.shouldRender || field.shouldRender(values);
+ })
+ .map((field) => field.name);
+ const isValid = await formRef.current?.trigger(
+ fields.length > 0 ? fieldNames : undefined,
+ );
if (!isValid) return;
setLoading(true);
@@ -326,7 +337,7 @@ export const useTestDataSource = (
} finally {
setLoading(false);
}
- }, [connectorId, formRef, id]);
+ }, [connectorId, fields, formRef, id]);
return { loading, handleTest };
};