Merge pull request #3604 from ingef/fix-search

Try and fix search again for multi-nested struct nodes
ingef · Oct 14, 2024 · ee551d4 · ee551d4
2 parents 65e72db + a26ebf4
commit ee551d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/frontend/src/js/concept-trees/ConceptTreeFolder.tsx b/frontend/src/js/concept-trees/ConceptTreeFolder.tsx
@@ -35,16 +35,20 @@ const sumMatchingEntries = (children: string[], initSum: number) => {
 export const getNonFolderChildren = (
   trees: TreesT,
   node: LoadedConcept,
+  conceptId: ConceptIdT,
 ): string[] => {
-  if (node.detailsAvailable) return node.children || [];
+  if (node.detailsAvailable) return [conceptId, ...(node.children || [])];
 
-  if (!node.children) return [];
+  if (!node.children) return [conceptId];
 
   // collect all non-folder children, recursively
-  return node.children.reduce<ConceptIdT[]>((acc, childId) => {
-    const child = trees[childId];
-    return acc.concat(getNonFolderChildren(trees, child));
-  }, []);
+  return node.children.reduce<ConceptIdT[]>(
+    (acc, childId) => {
+      const child = trees[childId];
+      return acc.concat(getNonFolderChildren(trees, child, childId));
+    },
+    [conceptId],
+  );
 };
 
 const ConceptTreeFolder = ({
@@ -73,8 +77,10 @@ const ConceptTreeFolder = ({
 
   const nonFolderChildren = useMemo(
     () =>
-      tree.detailsAvailable ? tree.children : getNonFolderChildren(trees, tree),
-    [trees, tree],
+      tree.detailsAvailable
+        ? tree.children
+        : getNonFolderChildren(trees, tree, conceptId),
+    [trees, tree, conceptId],
   );
 
   if (

diff --git a/frontend/src/js/concept-trees/ConceptTreeListItem.tsx b/frontend/src/js/concept-trees/ConceptTreeListItem.tsx
@@ -22,8 +22,10 @@ const ConceptTreeListItem = ({
 
   const nonFolderChildren = useMemo(
     () =>
-      tree.detailsAvailable ? tree.children : getNonFolderChildren(trees, tree),
-    [trees, tree],
+      tree.detailsAvailable
+        ? tree.children
+        : getNonFolderChildren(trees, tree, conceptId),
+    [trees, tree, conceptId],
   );
 
   if (!isNodeInSearchResult(conceptId, search, nonFolderChildren)) return null;