Merge pull request #9 from noworneverev/bug/covariate

Fix rendering result graph bug

Author: noworneverev

src/app/components/DetailDrawer.tsx

@@ -177,6 +177,11 @@ const DetailDrawer: React.FC<DetailDrawerProps> = ({
               </Typography>
               <Typography>ID: {selectedNode.uuid}</Typography>
               <Typography>Name: {selectedNode.name}</Typography>
+              {selectedNode.covariate_type && (
+                <Typography>
+                  Covariate Type: {selectedNode.covariate_type}
+                </Typography>
+              )}
               <Typography>Type: {selectedNode.type}</Typography>
               {selectedNode.title && (
                 <Typography>Title: {selectedNode.title}</Typography>
@@ -193,6 +198,11 @@ const DetailDrawer: React.FC<DetailDrawerProps> = ({
               {selectedNode.description && (
                 <Typography>Description: {selectedNode.description}</Typography>
               )}
+              {selectedNode.human_readable_id && (
+                <Typography>
+                  Human Readable ID: {selectedNode.human_readable_id}
+                </Typography>
+              )}
 
               {/* {selectedNode.human_readable_id ||
                 (selectedNode.human_readable_id === 0 && (

src/app/components/GraphViewer.tsx

@@ -184,7 +184,8 @@ const GraphViewer: React.FC<GraphViewerProps> = ({
           } else if (key === "entities") {
             const existingNode = baseGraphData.nodes.find(
               (node) =>
-                node.human_readable_id?.toString() === item.id.toString()
+                node.human_readable_id?.toString() === item.id.toString() &&
+                !node.covariate_type
             );
             if (existingNode) {
               newNodes.push(existingNode);
@@ -206,7 +207,8 @@ const GraphViewer: React.FC<GraphViewerProps> = ({
           } else if (key === "covariates" || key === "claims") {
             const existingNode = baseGraphData.nodes.find(
               (node) =>
-                node.human_readable_id?.toString() === item.id.toString()
+                node.human_readable_id?.toString() === item.id.toString() &&
+                node.covariate_type
             );
             if (existingNode) {
               newNodes.push(existingNode);

src/app/hooks/useGraphData.ts

@@ -227,7 +227,8 @@ const useGraphData = (
         human_readable_id: covariate.human_readable_id,
         name: `COVARIATE ${covariate.id}`,
         covariate_type: covariate.covariate_type,
-        type: "COVARIATE",
+        // type: "COVARIATE",
+        type: covariate.type,
         description: covariate.description || "",
         subject_id: covariate.subject_id,
         subject_type: covariate.subject_type,

src/app/models/custom-graph-data.ts

@@ -40,7 +40,7 @@ export interface CustomNode extends NodeObject {
     end_date?: string;
     source_text?: string;
     text_unit_id?: string;
-  
+    covariate_type?: string;
   }
 
 export interface CustomLink extends LinkObject {