@molgenis/vip-report-template 2.7.0 → 2.7.1

package/.scannerwork/report-task.txt

@@ -1,8 +1,8 @@
 organization=molgenis
 projectKey=molgenis_vip-report-template
 serverUrl=https://sonarcloud.io
-serverVersion=8.0.0.25095
-branch=v2.7.0
-dashboardUrl=https://sonarcloud.io/dashboard?id=molgenis_vip-report-template&branch=v2.7.0&resolved=false
-ceTaskId=AX1XHdIGtnZUQKKxYAWZ
-ceTaskUrl=https://sonarcloud.io/api/ce/task?id=AX1XHdIGtnZUQKKxYAWZ
+serverVersion=8.0.0.25123
+branch=v2.7.1
+dashboardUrl=https://sonarcloud.io/dashboard?id=molgenis_vip-report-template&branch=v2.7.1&resolved=false
+ceTaskId=AX1bK9rH9EclnW_8YXd3
+ceTaskUrl=https://sonarcloud.io/api/ce/task?id=AX1bK9rH9EclnW_8YXd3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@molgenis/vip-report-template",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "Report Template for Variant Call Format (VCF) Report Generator",
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/types/DecisionTree.d.ts

@@ -32,8 +32,8 @@ type CategoricalNode = {
   outcomeMap: {
     [key: string]: Outcome;
   };
-  outcomeMissing: Outcome;
-  outcomeDefault: Outcome;
+  outcomeMissing?: Outcome;
+  outcomeDefault?: Outcome;
 };
 
 type ExitNode = {

package/src/utils/treeBuilder.ts

@@ -63,19 +63,34 @@ export const retrieveEdges = (inputTree: DecisionTree): TreeEdgesArray => {
   let edges: TreeEdgesObj = {};
   Object.keys(inputTree.nodes).forEach((key) => {
     const node: Node = inputTree.nodes[key];
-    if ('outcomeTrue' in node) {
-      edges = createSimpleEdge('True', node, key, edges);
-      edges = createSimpleEdge('False', node, key, edges);
-      if ('outcomeMissing' in node) {
-        edges = createSimpleEdge('Missing', node, key, edges);
-      }
-    } else if ('outcomeMap' in node) {
-      Object.keys(node.outcomeMap).forEach((category) => {
-        const nextNode = node.outcomeMap[category].nextNode;
-        edges = createEdge(nextNode, category, key, edges);
-      });
-      edges = createSimpleEdge('Missing', node, key, edges);
-      edges = createSimpleEdge('Default', node, key, edges);
+    switch (node.type) {
+      case 'BOOL':
+        edges = createSimpleEdge('True', node, key, edges);
+        edges = createSimpleEdge('False', node, key, edges);
+        if ('outcomeMissing' in node) {
+          edges = createSimpleEdge('Missing', node, key, edges);
+        }
+        break;
+      case 'CATEGORICAL':
+        Object.keys(node.outcomeMap).forEach((category) => {
+          const nextNode = node.outcomeMap[category].nextNode;
+          edges = createEdge(nextNode, category, key, edges);
+        });
+        if ('outcomeMissing' in node) {
+          edges = createSimpleEdge('Missing', node, key, edges);
+        }
+        if ('outcomeDefault' in node) {
+          edges = createSimpleEdge('Default', node, key, edges);
+        }
+        break;
+      case 'EXISTS':
+        edges = createSimpleEdge('True', node, key, edges);
+        edges = createSimpleEdge('False', node, key, edges);
+        break;
+      case 'LEAF':
+        break;
+      default:
+        throw new Error('unknown node type');
     }
   });
   return Object.keys(edges).map((k) => edges[k]);

package/tests/unit/utils/treeBuilder.spec.ts

@@ -199,4 +199,58 @@ describe('treeBuilder', () => {
     ];
     expect(outcome).toStrictEqual(expected);
   });
+  it('should generate edges for CATEGORICAL node without default/missing', () => {
+    const decisionTree: DecisionTree = {
+      files: {
+        panel: {
+          path: 'path/to/tsv'
+        }
+      },
+      rootNode: 'ROOT',
+      nodes: {
+        categoricalField: {
+          type: 'CATEGORICAL',
+          description: 'check categorical field',
+          field: 'FIELD_TO_CHECK',
+          outcomeMap: {
+            P: {
+              nextNode: 'exit_t'
+            },
+            LP: {
+              nextNode: 'exit_t'
+            },
+            LB: {
+              nextNode: 'exit_f'
+            },
+            B: {
+              nextNode: 'exit_f'
+            }
+          }
+        },
+        exit_t: {
+          type: 'LEAF',
+          class: 'T'
+        },
+        exit_f: {
+          type: 'LEAF',
+          class: 'F'
+        }
+      }
+    };
+
+    const outcome = retrieveEdges(decisionTree);
+    const expected = [
+      {
+        from: 'categoricalField',
+        to: 'exit_t',
+        label: 'P\nLP'
+      },
+      {
+        from: 'categoricalField',
+        to: 'exit_f',
+        label: 'LB\nB'
+      }
+    ];
+    expect(outcome).toStrictEqual(expected);
+  });
 });