RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Fix: When calling the `children` and `graph` interfaces on the wiki tree page, the `keywords` parameter should be included. (#19627)
balibabu0437e1d58b7f
diff --git a/web/src/hooks/use-dataset-nav-request.ts b/web/src/hooks/use-dataset-nav-request.tsindex ce3a58a25f..608cc04f0b 100644--- a/web/src/hooks/use-dataset-nav-request.ts+++ b/web/src/hooks/use-dataset-nav-request.ts@@ -27,8 +27,8 @@ export const DatasetNavKeys = {all: (kbId: string) => ['dataset_nav', kbId] as const,list: (kbId: string, keywords = '') =>['dataset_nav', kbId, 'list', keywords] as const,- children: (kbId: string, name: string) =>- ['dataset_nav', kbId, 'children', name] as const,+ children: (kbId: string, name: string, keywords = '') =>+ ['dataset_nav', kbId, 'children', name, keywords] as const,};type DatasetNavResponse<T> = {@@ -85,8 +85,12 @@ export function useFetchDatasetNav(keywords = '') {return { data, loading, isError, error, refetch };}-export function useFetchDatasetNavChildren(parentName: string | null) {+export function useFetchDatasetNavChildren(+ parentName: string | null,+ keywords = '',+) {const kbId = useKnowledgeBaseId();+ const trimmedKeywords = trim(keywords);const enabled = !!kbId && !!parentName;const {@@ -96,7 +100,7 @@ export function useFetchDatasetNavChildren(parentName: string | null) {error,refetch,} = useQuery<DatasetNavList | null>({- queryKey: DatasetNavKeys.children(kbId, parentName ?? ''),+ queryKey: DatasetNavKeys.children(kbId, parentName ?? '', trimmedKeywords),initialData: null,enabled,gcTime: 0,@@ -105,6 +109,7 @@ export function useFetchDatasetNavChildren(parentName: string | null) {const { data } = await datasetNavService.getNavChildren({datasetId: kbId,name: parentName!,+ keywords: trimmedKeywords,});return unwrapDatasetNavResponse(data);},diff --git a/web/src/pages/dataset/compilation/hooks/use-compilation-nav.ts b/web/src/pages/dataset/compilation/hooks/use-compilation-nav.tsindex 69060ba29e..43ca0a61ef 100644--- a/web/src/pages/dataset/compilation/hooks/use-compilation-nav.ts+++ b/web/src/pages/dataset/compilation/hooks/use-compilation-nav.ts@@ -9,6 +9,7 @@ import { useKnowledgeBaseId } from '@/hooks/use-knowledge-request';import { DatasetNavNode } from '@/interfaces/database/dataset-nav';import { IStructureGraphTemplate } from '@/interfaces/database/document-structure';import { useDebounce } from 'ahooks';+import { trim } from 'lodash';import { useCallback, useEffect, useState } from 'react';export interface SelectedNavNode {@@ -26,6 +27,9 @@ export function useCompilationNav() {const kbId = useKnowledgeBaseId();const [keywords, setKeywords] = useState('');const debouncedKeywords = useDebounce(keywords, { wait: 500 });+ // The filter actually applied to requests; the input value lags behind it by+ // the debounce window.+ const activeKeywords = trim(debouncedKeywords);const {data: navList,loading: navLoading,@@ -51,9 +55,13 @@ export function useCompilationNav() {);const { data: childrenData, isError: childrenError } =- useFetchDatasetNavChildren(loadingParent);+ useFetchDatasetNavChildren(loadingParent, activeKeywords);const { data: structureData, isPlaceholderData: structurePlaceholder } =- useFetchDocumentStructureGraphById(kbId, loadingDocId ?? '');+ useFetchDocumentStructureGraphById(+ kbId,+ loadingDocId ?? '',+ activeKeywords || undefined,+ );useEffect(() => {if (!loadingParent || !childrenData) {@@ -106,6 +114,20 @@ export function useCompilationNav() {}}, [loadingDocId, structureData, structurePlaceholder]);+ const clearExpandedData = useCallback(() => {+ setChildrenMap({});+ setChildrenErrorParents({});+ setLoadingParent(null);+ setStructureMap({});+ setLoadingDocId(null);+ }, []);++ useEffect(() => {+ // Loaded children/graphs were fetched under the previous keywords filter;+ // drop them so re-expansion refetches under the active filter.+ clearExpandedData();+ }, [activeKeywords, clearExpandedData]);+const loadChildren = useCallback((name: string) => {setChildrenErrorParents((prev) => {@@ -177,12 +199,8 @@ export function useCompilationNav() {const resetNav = useCallback(() => {setSelectedNode(null);- setChildrenMap({});- setChildrenErrorParents({});- setLoadingParent(null);- setStructureMap({});- setLoadingDocId(null);- }, []);+ clearExpandedData();+ }, [clearExpandedData]);const handleKeywordsChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {@@ -280,6 +298,7 @@ export function useCompilationNav() {navLoading,navError,keywords,+ activeKeywords,childrenMap,childrenErrorParents,structureMap,diff --git a/web/src/pages/dataset/compilation/nav-tree-left-panel.test.tsx b/web/src/pages/dataset/compilation/nav-tree-left-panel.test.tsxindex fefc45d662..b159a66fb7 100644--- a/web/src/pages/dataset/compilation/nav-tree-left-panel.test.tsx+++ b/web/src/pages/dataset/compilation/nav-tree-left-panel.test.tsx@@ -57,6 +57,7 @@ describe('NavTreeLeftPanel', () => {navLoading={false}navErrorkeywords=""+ activeKeywords=""childrenMap={{}}structureMap={{}}deleteNavLoading={false}@@ -78,6 +79,7 @@ describe('NavTreeLeftPanel', () => {navLoading={false}navErrorkeywords=""+ activeKeywords=""childrenMap={{}}structureMap={{}}deleteNavLoading={false}diff --git a/web/src/pages/dataset/compilation/nav-tree-left-panel.tsx b/web/src/pages/dataset/compilation/nav-tree-left-panel.tsxindex 6aac2f23f8..610a6773f2 100644--- a/web/src/pages/dataset/compilation/nav-tree-left-panel.tsx+++ b/web/src/pages/dataset/compilation/nav-tree-left-panel.tsx@@ -73,6 +73,12 @@ type NavTreeLeftPanelProps = {navLoading: boolean;navError?: boolean;keywords: string;+ // The debounced filter applied to the nav/children/graph requests. Used as+ // the TreeView key so a filter change remounts the tree: expansion state is+ // uncontrolled per node and onExpand only fires on opening, so without a+ // remount an already-open node whose cached children were dropped would sit+ // on the loading placeholder forever.+ activeKeywords: string;childrenMap: Record<string, DatasetNavNode[]>;childrenErrorParents?: Record<string, boolean>;structureMap: Record<string, IStructureGraphTemplate[]>;@@ -91,6 +97,7 @@ export function NavTreeLeftPanel({navLoading,navError = false,keywords,+ activeKeywords,childrenMap,childrenErrorParents = {},structureMap,@@ -195,6 +202,7 @@ export function NavTreeLeftPanel({</div>) : null}<TreeView+ key={activeKeywords}data={treeData}expandOnRowClick={false}defaultNodeIcon={Folder}diff --git a/web/src/pages/dataset/compilation/nav-tree-view.tsx b/web/src/pages/dataset/compilation/nav-tree-view.tsxindex b0e4e1b9f5..f998faf46d 100644--- a/web/src/pages/dataset/compilation/nav-tree-view.tsx+++ b/web/src/pages/dataset/compilation/nav-tree-view.tsx@@ -16,6 +16,7 @@ export function NavTreeView() {navLoading,navError,keywords,+ activeKeywords,childrenMap,childrenErrorParents,structureMap,@@ -39,6 +40,7 @@ export function NavTreeView() {navLoading={navLoading}navError={navError}keywords={keywords}+ activeKeywords={activeKeywords}childrenMap={childrenMap}childrenErrorParents={childrenErrorParents}structureMap={structureMap}diff --git a/web/src/services/dataset-nav-service.ts b/web/src/services/dataset-nav-service.tsindex e4c2c46b75..f54782f486 100644--- a/web/src/services/dataset-nav-service.ts+++ b/web/src/services/dataset-nav-service.ts@@ -22,8 +22,14 @@ const datasetNavService = {request.get(api.getDatasetNav(params.datasetId), {params: { keywords: params.keywords || undefined },}),- getNavChildren: (params: { datasetId: string; name: string }) =>- request.get(api.getDatasetNavChildren(params.datasetId, params.name)),+ getNavChildren: (params: {+ datasetId: string;+ name: string;+ keywords?: string;+ }) =>+ request.get(api.getDatasetNavChildren(params.datasetId, params.name), {+ params: { keywords: params.keywords || undefined },+ }),deleteNav: (params: { datasetId: string }) =>request.delete(api.deleteDatasetNav(params.datasetId)),deleteNavNode: (params: { datasetId: string; name: string }) =>