fix issue with missing edges between collapsed families in different cycles

markgrahamdawson · markgrahamdawson · commit b108b6f04935 · 2025-03-28T13:29:36.000Z
diff --git a/src/views/Graph.vue b/src/views/Graph.vue
@@ -1380,8 +1380,8 @@ export default {
                   if (edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)) {
                     if (!this.collapseCycle.includes(sourceCycle) && !this.collapseCycle.includes(targetCycle)) {
                       const familyData = edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)
-                      this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)
-                      if (familyData.source !== familyData.target) {
+                      if (familyData.source !== familyData.target || sourceCycle !== targetCycle) {
+                        this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)
                         edges.push(this.edgeTemplate)
                       }
                     }
@@ -1408,8 +1408,8 @@ export default {
                   if (edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)) {
                     if (!this.collapseCycle.includes(sourceCycle) && !this.collapseCycle.includes(targetCycle)) {
                       const familyData = edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)
-                      this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)
-                      if (familyData.source !== familyData.target) {
+                      if (familyData.source !== familyData.target || sourceCycle !== targetCycle) {
+                        this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)
                         edges.push(this.edgeTemplate)
                       }
                     }

Original file line number	Diff line number	Diff line change
`@@ -1380,8 +1380,8 @@ export default {`
`1380`	`1380`	`if (edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)) {`
`1381`	`1381`	`if (!this.collapseCycle.includes(sourceCycle) && !this.collapseCycle.includes(targetCycle)) {`
`1382`	`1382`	`const familyData = edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)`
`1383`		`- this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)`
`1384`		`- if (familyData.source !== familyData.target) {`
	`1383`	`+ if (familyData.source !== familyData.target \|\| sourceCycle !== targetCycle) {`
	`1384`	`+ this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)`
`1385`	`1385`	`edges.push(this.edgeTemplate)`
`1386`	`1386`	`}`
`1387`	`1387`	`}`
`@@ -1408,8 +1408,8 @@ export default {`
`1408`	`1408`	`if (edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)) {`
`1409`	`1409`	`if (!this.collapseCycle.includes(sourceCycle) && !this.collapseCycle.includes(targetCycle)) {`
`1410`	`1410`	`const familyData = edgeHasCollapsedTargetandSourceFamily(targetFamilyName, sourceFamilyName)`
`1411`		`- this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)`
`1412`		`- if (familyData.source !== familyData.target) {`
	`1411`	`+ if (familyData.source !== familyData.target \|\| sourceCycle !== targetCycle) {`
	`1412`	`+ this.edgeTemplate = this.createEdge('noCollapsed', familyData.source, familyData.target, sourceCycle, targetCycle)`
`1413`	`1413`	`edges.push(this.edgeTemplate)`
`1414`	`1414`	`}`
`1415`	`1415`	`}`