Merge pull request #1161 from microbiomedata/fix-grow-study

Grow Study fixes
microbiomedata · Feb 29, 2024 · ccd899b · ccd899b
2 parents d4ec9d2 + 13a4c6a
commit ccd899b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/nmdc_server/api.py b/nmdc_server/api.py
@@ -284,23 +284,25 @@ async def search_study(
         children_studies = crud.search_study(db, children_condition).all()
         top_level_studies = crud.search_study(db, top_level_condition).all()
 
-        #     """
-        #     If there are children studies that match the query, but the top level studies do not,
-        #     add the parent to the top level studies
-        #     """
-        for child in children_studies:
-            for parent_id in child.part_of:
-                if parent_id not in [
-                    parent.id for parent in top_level_studies
-                ] and child.id not in [parent.id for parent in top_level_studies]:
-                    top_level_studies.append(child)
-
         for parent in top_level_studies:
             parent.children = []
             for child in children_studies:
                 if child.part_of is not None and parent.id in child.part_of:
                     parent.children.append(child)
 
+        # If there are children studies that match the query, but their top level studies do not,
+        # and they are not already listed as children of another top level study,
+        # add the child to the top level studies
+        for child in children_studies:
+            for parent_id in child.part_of:
+                if (
+                    parent_id not in [parent.id for parent in top_level_studies]
+                    and child.id not in [parent.id for parent in top_level_studies]
+                    and child.id
+                    not in [child.id for parent in top_level_studies for child in parent.children]
+                ):
+                    top_level_studies.append(child)
+
         count = len(top_level_studies)
 
         total = crud.search_study(db, q.conditions).count()

diff --git a/web/src/views/Search/SearchLayout.vue b/web/src/views/Search/SearchLayout.vue
@@ -136,11 +136,19 @@ export default defineComponent({
       .map((r) => ({
         ...r,
         name: r.annotations.title || r.name,
+        children: r.children?.map((c) => ({
+          ...c,
+          name: c.annotations.title || c.name,
+        })),
       })));
     const consortiumStudyResults = computed(() => Object.values(consortium.data.results.results)
       .map((r) => ({
         ...r,
         name: r.annotations.title || r.name,
+        children: r.children?.map((c) => ({
+          ...c,
+          name: c.annotations.title || c.name,
+        })),
       })));
 
     const loggedInUser = computed(() => typeof stateRefs.user.value === 'string');