[age-viewer] branch main updated: Node/Edge visibility refactor (#89)

[hbshin]

This is an automated email from the ASF dual-hosted git repository.

hbshin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/age-viewer.git


The following commit(s) were added to refs/heads/main by this push:
     new f0a8c81  Node/Edge visibility refactor (#89)
f0a8c81 is described below

commit f0a8c817a565f12fc0f33e18fa3018dae9e2d334
Author: marodins <67288224+marod...@users.noreply.github.com>
AuthorDate: Wed Dec 28 21:33:43 2022 -0800

    Node/Edge visibility refactor (#89)
    
    * refactor edge and node size implementation
    
    * include log statements
---
 frontend/src/features/cypher/CypherUtil.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/frontend/src/features/cypher/CypherUtil.js 
b/frontend/src/features/cypher/CypherUtil.js
index 7573716..64d09c7 100644
--- a/frontend/src/features/cypher/CypherUtil.js
+++ b/frontend/src/features/cypher/CypherUtil.js
@@ -185,13 +185,11 @@ const getEdgeColor = (labelName) => {
 const getNodeSize = (labelName) => {
   let selectedSize = 0;
 
-  nodeLabelSizes.forEach((labelSize) => {
-    if (labelSize.labels.has(labelName)) {
-      selectedSize = labelSize.size;
-    }
-  });
+  const nSize = nodeLabelSizes.find((labelSize) => 
labelSize.labels.has(labelName));
 
-  if (selectedSize === 0) {
+  if (nSize) {
+    selectedSize = nSize.size;
+  } else {
     nodeLabelSizes[2].labels.add(labelName);
     selectedSize = nodeLabelSizes[2].size;
   }
@@ -202,13 +200,11 @@ const getNodeSize = (labelName) => {
 const getEdgeSize = (labelName) => {
   let selectedSize = 0;
 
-  edgeLabelSizes.forEach((labelSize) => {
-    if (labelSize.labels.has(labelName)) {
-      selectedSize = labelSize.size;
-    }
-  });
+  const eSize = edgeLabelSizes.find((labelSize) => 
labelSize.labels.has(labelName));
 
-  if (selectedSize === 0) {
+  if (eSize) {
+    selectedSize = eSize.size;
+  } else {
     edgeLabelSizes[0].labels.add(labelName);
     selectedSize = edgeLabelSizes[0].size;
   }
@@ -290,7 +286,7 @@ export const generateCytoscapeElement = (data, 
maxDataOfGraph, isNew) => {
   const edgeLegend = {};
 
   function generateElements(alias, val) {
-    const labelName = val.label;
+    const labelName = val.label.trim();
     let source = val.start;
     let target = val.end;
 
@@ -341,6 +337,7 @@ export const generateCytoscapeElement = (data, 
maxDataOfGraph, isNew) => {
           classes: isNew ? 'new node' : 'edge',
         },
       );
+      console.log(JSON.stringify(labelName), edgeLegend[labelName], edges);
     } else {
       if (!Object.prototype.hasOwnProperty.call(nodeLegend, labelName)) {
         nodeLegend[labelName] = {
@@ -380,7 +377,6 @@ export const generateCytoscapeElement = (data, 
maxDataOfGraph, isNew) => {
       );
     }
   }
-
   if (data) {
     data.forEach((row, index) => {
       if (index >= maxDataOfGraph && maxDataOfGraph !== 0) {
@@ -400,7 +396,7 @@ export const generateCytoscapeElement = (data, 
maxDataOfGraph, isNew) => {
       });
     });
   }
-
+  console.log('edge sizes', edgeLabelSizes);
   return {
     legend: {
       nodeLegend: sortByKey(nodeLegend),