#1602 Update of handling of nested subgraphs

src/diagrams/flowchart/flowDb.js

@@ -421,6 +421,22 @@ export const addSubGraph = function(_id, list, _title) {
   title = common.sanitizeText(title, config);
   subCount = subCount + 1;
   const subGraph = { id: id, nodes: nodeList, title: title.trim(), classes: [] };
+
+  /**
+   * Deletes an id from all subgraphs
+   */
+  const del = _id => {
+    subGraphs.forEach(sg => {
+      const pos = sg.nodes.indexOf(_id);
+      if (pos >= 0) {
+        console.log(sg.nodes, pos, _id);
+        sg.nodes.splice(pos, 1);
+      }
+    });
+  };
+  // Removes the members of this subgraph from any other subgraphs, a node only belong to one subgraph
+  subGraph.nodes.forEach(_id => del(_id));
+  console.log(subGraph.nodes);
   subGraphs.push(subGraph);
   subGraphLookup[id] = subGraph;
   return id;

src/diagrams/flowchart/flowRenderer-v2.js

@@ -382,11 +382,13 @@ export const draw = function(text, id) {
   logger.info(edges);
   let i = 0;
   for (i = subGraphs.length - 1; i >= 0; i--) {
+    // for (let i = 0; i < subGraphs.length; i++) {
     subG = subGraphs[i];
 
     selectAll('cluster').append('text');
 
     for (let j = 0; j < subG.nodes.length; j++) {
+      logger.info('Setting up subgraphs', subG.nodes[j], subG.id);
       g.setParent(subG.nodes[j], subG.id);
     }
   }

src/diagrams/flowchart/parser/subgraph.spec.js

@@ -1,5 +1,6 @@
 import flowDb from '../flowDb';
 import flow from './flow';
+import filter from 'lodash/filter';
 import { setConfig } from '../../../config';
 
 setConfig({
@@ -238,4 +239,75 @@ describe('when parsing subgraphs', function() {
 
     expect(edges[0].type).toBe('arrow_point');
   });
+  it('should handle nested subgraphs 1', function() {
+    const res = flow.parser.parse(`flowchart TB
+    subgraph A
+    b-->B
+    a-->c
+    end
+    subgraph B
+      c
+    end`);
+
+    const subgraphs = flow.parser.yy.getSubGraphs();
+    expect(subgraphs.length).toBe(2);
+
+    const subgraphA = filter(subgraphs,o => o.id === 'A')[0];
+    const subgraphB = filter(subgraphs,o => o.id === 'B')[0];
+
+    expect(subgraphB.nodes[0]).toBe('c');
+    expect(subgraphA.nodes).toContain('B');
+    expect(subgraphA.nodes).toContain('b');
+    expect(subgraphA.nodes).toContain('a');
+    expect(subgraphA.nodes).not.toContain('c');
+  });
+  it('should handle nested subgraphs 2', function() {
+    const res = flow.parser.parse(`flowchart TB
+    b-->B
+    a-->c
+    subgraph B
+      c
+    end
+    subgraph A
+        a
+        b
+        B
+    end`);
+
+    const subgraphs = flow.parser.yy.getSubGraphs();
+    expect(subgraphs.length).toBe(2);
+
+    const subgraphA = filter(subgraphs,o => o.id === 'A')[0];
+    const subgraphB = filter(subgraphs,o => o.id === 'B')[0];
+
+    expect(subgraphB.nodes[0]).toBe('c');
+    expect(subgraphA.nodes).toContain('B');
+    expect(subgraphA.nodes).toContain('b');
+    expect(subgraphA.nodes).toContain('a');
+    expect(subgraphA.nodes).not.toContain('c');
+  });
+  it('should handle nested subgraphs 3', function() {
+    console.log('#3');
+    const res = flow.parser.parse(`flowchart TB
+    subgraph B
+      c
+    end
+    a-->c
+    subgraph A
+      b-->B
+      a
+    end`);
+
+    const subgraphs = flow.parser.yy.getSubGraphs();
+    expect(subgraphs.length).toBe(2);
+
+    const subgraphA = filter(subgraphs,o => o.id === 'A')[0];
+    const subgraphB = filter(subgraphs,o => o.id === 'B')[0];
+    console.log(subgraphB.nodes)
+    expect(subgraphB.nodes[0]).toBe('c');
+    expect(subgraphA.nodes).toContain('B');
+    expect(subgraphA.nodes).toContain('b');
+    expect(subgraphA.nodes).toContain('a');
+    expect(subgraphA.nodes).not.toContain('c');
+  });
 });