Merge pull request #858 from EBISPOT/fix-entity-tree-issue

Fix Tree View not opening for certain classes

Author: haideriqbal

frontend/src/pages/ontologies/entities/EntityTree.tsx

@@ -354,7 +354,7 @@ export default function EntityTree({
                 showCountsEnabled &&
                 childNode.numDescendants > 0 && (
                   <span style={{ color: "gray" }}>
-                    {" (" + childNode.numDescendants.toLocaleString() + ")"}
+                    {" (" + (getNumDescendants(childNode.numHierarchicalDescendants, childNode.numDescendants)).toLocaleString() + ")"}
                   </span>
                 )}
               {isExpanded &&
@@ -445,6 +445,16 @@ export default function EntityTree({
   );
 }
 
+function getNumDescendants(hierarchicalDescendents: number, descendents: number): number {
+    if (descendents === hierarchicalDescendents) {
+        return descendents;
+    } else if (descendents > hierarchicalDescendents) {
+        return descendents;
+    } else {
+        return hierarchicalDescendents;
+    }
+}
+
 function TreeLink({
   ontology,
   entity,

frontend/src/pages/ontologies/entities/createTreeFromEntities.ts

@@ -61,8 +61,8 @@ export default function createTreeFromEntities(
       title: node.getName(),
       expandable: node.hasChildren(),
       entity: node,
-      numDescendants:
-        node.getNumHierarchicalDescendants() || node.getNumDescendants(),
+      numDescendants: node.getNumDescendants(),
+      numHierarchicalDescendants: node.getNumHierarchicalDescendants(),
       parentRelationToChild,
       childRelationToParent
     };

frontend/src/pages/ontologies/entities/entityPageSections/IndividualPropertyAssertionsSection.tsx

@@ -22,15 +22,17 @@ export default function IndividualPropertyAssertionsSection({
   );
 
   let objectProperties = propertyIris.filter(
-    (k) =>
-        linkedEntities.get(k) &&
-        linkedEntities.get(k)!.type.indexOf("objectProperty") !== -1
+      (k) => {
+        const linkedEntity = linkedEntities.get(k);
+        return linkedEntity && Array.isArray(linkedEntity.type) && linkedEntity.type.indexOf("objectProperty") !== -1;
+      }
   );
 
   let dataProperties = propertyIris.filter(
-    (k) =>
-        linkedEntities.get(k) &&
-        linkedEntities.get(k)!.type.indexOf("dataProperty") !== -1
+      (k) => {
+        const linkedEntity = linkedEntities.get(k);
+        return linkedEntity && Array.isArray(linkedEntity.type) && linkedEntity.type.indexOf("dataProperty") !== -1;
+      }
   );
 
   let propertyAssertions: JSX.Element[] = [];

frontend/src/pages/ontologies/ontologiesSlice.ts

@@ -43,6 +43,7 @@ export interface TreeNode {
   expandable: boolean;
   entity: Entity;
   numDescendants: number;
+  numHierarchicalDescendants: number;
   parentRelationToChild: string | null; // if applicable, relation from the parent node to this node (e.g. has_part)
   childRelationToParent: string | null; // if applicable, relation from this node to the parent node (e.g. part_of)
 }
@@ -420,17 +421,37 @@ export const getNodeChildren = createAsyncThunk(
     const doubleEncodedUri = encodeURIComponent(encodeURIComponent(entityIri));
     var childrenPage: any;
     if (entityTypePlural === "classes") {
-      childrenPage = await getPaginated<any>(
-        `api/v2/ontologies/${ontologyId}/classes/${doubleEncodedUri}/hierarchicalChildren?${new URLSearchParams(
-          {
-            size: "1000",
-            lang,
-            includeObsoleteEntities: showObsoleteEnabled,
-          }
-        )}`,
-        undefined,
-        apiUrl
-      );
+        const hierarchicalChildrenPromise = getPaginated<any>(
+            `api/v2/ontologies/${ontologyId}/classes/${doubleEncodedUri}/hierarchicalChildren?${new URLSearchParams({
+                size: "1000",
+                lang,
+                includeObsoleteEntities: showObsoleteEnabled,
+            })}`,
+            undefined,
+            apiUrl
+        );
+        const directChildrenPromise = getPaginated<any>(
+            `api/v2/ontologies/${ontologyId}/classes/${doubleEncodedUri}/children?${new URLSearchParams({
+                size: "1000",
+                lang,
+                includeObsoleteEntities: showObsoleteEnabled,
+            })}`,
+            undefined,
+            apiUrl
+        );
+
+        const [hierarchicalChildren, directChildren] = await Promise.all([
+            hierarchicalChildrenPromise,
+            directChildrenPromise,
+        ]);
+
+        // Merge the elements from both responses
+        childrenPage = {
+            elements: [
+                ...hierarchicalChildren.elements,
+                ...directChildren.elements,
+            ],
+        };
     } else if (entityTypePlural === "individuals") {
       childrenPage = await getPaginated<any>(
         `api/v2/ontologies/${ontologyId}/classes/${doubleEncodedUri}/individuals?${new URLSearchParams(
@@ -469,8 +490,8 @@ export const getNodeChildren = createAsyncThunk(
             title: term.getName(),
             expandable: term.hasChildren(),
             entity: term,
-            numDescendants:
-              term.getNumHierarchicalDescendants() || term.getNumDescendants(),
+            numDescendants: term.getNumDescendants(),
+            numHierarchicalDescendants: term.getNumHierarchicalDescendants(),
             parentRelationToChild:
               (parenthoodMetadata &&
                 parenthoodMetadata["parentRelationToChild"]?.[0]) ||