Fixes #866. Was using .includes(parseInt(row.concept_id)) for expand

collapse; forgot that unlinked concepts have a fake parent with concept_id of 'unlinked'.
jhu-bids · Sep 5, 2024 · 234bb01 · 234bb01
1 parent 6c9ec11
commit 234bb01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/frontend/src/components/CsetComparisonPage.jsx b/frontend/src/components/CsetComparisonPage.jsx
@@ -679,8 +679,11 @@ function getCollapseIconAndName(
     let Component;
     let direction;
     if (
-        graphOptions.specificNodesExpanded.includes(parseInt(row.concept_id)) ||
-        (graphOptions.expandAll && !graphOptions.specificNodesCollapsed.includes(parseInt(row.concept_id)))
+        // graphOptions.specificNodesExpanded.includes(parseInt(row.concept_id)) ||
+        // (graphOptions.expandAll && !graphOptions.specificNodesCollapsed.includes(parseInt(row.concept_id)))
+        // parseInt means it doesn't work with the 'unlinked' node
+        graphOptions.specificNodesExpanded.find(d => d == row.concept_id) ||
+        (graphOptions.expandAll && !graphOptions.specificNodesCollapsed.find(d => d == row.concept_id))
     ) {
         Component = RemoveCircleOutline;
         direction = 'collapse';

diff --git a/frontend/src/state/GraphState.jsx b/frontend/src/state/GraphState.jsx
@@ -265,8 +265,8 @@ export class GraphContainer {
     // this.displayedRows.push(row);
 
     if ((row.expanded || graphOptions.expandAll ||  // todo: get rid of row.expanded property -- not using anymore, right?
-        graphOptions.specificNodesExpanded.includes(parseInt(nodeId))) &&
-        ! graphOptions.specificNodesCollapsed.includes(parseInt(nodeId))
+        graphOptions.specificNodesExpanded.find(d => d == row.concept_id) &&
+        ! graphOptions.specificNodesCollapsed.find(d => d == row.concept_id))
     ) {
         // now with tracking specificNodesExpanded/Collapsed, I'm not sure if we
         //  still need to check row.expanded
@@ -494,20 +494,20 @@ export class GraphContainer {
       if (typeof(displayOption.specialTreatmentDefault) !== 'undefined') {
         if (typeof (displayOption.specialTreatment) === 'undefined') {
           // set specialTreatment to default only when initializing stats options
-          type === 'addedCids' && console.log(`setting ${type} to default`);
+          // type === 'addedCids' && console.log(`setting ${type} to default`);
           displayOption.specialTreatment = displayOption.specialTreatmentDefault;
         }
         if (typeof(graphOptions.specialConceptTreatment[type]) === 'undefined') {
           // set specialConceptTreatment[type] only when not already in graphOptions
-          type === 'addedCids' && console.log(`setting graphOption.specialConceptTreatment.${type} to ${displayOption.specialTreatment}`);
+          // type === 'addedCids' && console.log(`setting graphOption.specialConceptTreatment.${type} to ${displayOption.specialTreatment}`);
           graphOptions.specialConceptTreatment[type] = displayOption.specialTreatment;
         } else {
           // already have an option set, use that
           // this is wrong, but allows flipping bit if other bit is true
           // graphOptions.specialConceptTreatment[type] = (Boolean(graphOptions.specialConceptTreatment[type] + displayOption.specialTreatment) % 2);
           // no this is wrong
           displayOption.specialTreatment = graphOptions.specialConceptTreatment[type];
-          type === 'addedCids' && console.log(`just set specialTreatment.${type} to ${displayOption.specialTreatment}`);
+          // type === 'addedCids' && console.log(`just set specialTreatment.${type} to ${displayOption.specialTreatment}`);
         }
       }
       displayOptions[type] = displayOption;