From e638c1822a6002e48177edbdbea3223517d6c22a Mon Sep 17 00:00:00 2001
From: Joel Keyser <keyser.joel@gmail.com>
Date: Sat, 10 Feb 2024 20:51:34 -0600
Subject: [PATCH] fix: chained effects partition incorrectly

e.g. if an effect is not directly tied to a problem or solution, it
wouldn't have been partitioned as expected.
---
 src/web/topic/utils/layout.ts | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/web/topic/utils/layout.ts b/src/web/topic/utils/layout.ts
index a7ebf6ec..bad76719 100644
--- a/src/web/topic/utils/layout.ts
+++ b/src/web/topic/utils/layout.ts
@@ -2,8 +2,7 @@ import ELK, { ElkNode, LayoutOptions } from "elkjs";
 
 import { NodeType, nodeTypes } from "../../../common/node";
 import { nodeHeightPx, nodeWidthPx } from "../components/Node/EditableNode.styles";
-import { type Edge, type Node } from "./graph";
-import { children, parents } from "./node";
+import { type Edge, type Node, ancestors, descendants } from "./graph";
 
 export type Orientation = "DOWN" | "UP" | "RIGHT" | "LEFT";
 
@@ -64,10 +63,25 @@ const calculatePartition = (node: Node, nodes: Node[], edges: Edge[]) => {
   const topicGraph = { nodes, edges };
 
   if (["effect", "benefit", "detriment"].includes(node.type)) {
-    const hasProblemSource = parents(node, topicGraph).some((parent) => parent.type === "problem");
-    const hasSolutionTarget = children(node, topicGraph).some((child) => child.type === "solution");
-    if (hasProblemSource && hasSolutionTarget) return "null";
-    else if (hasProblemSource) return "0";
+    const nodeAncestors = ancestors(node, topicGraph);
+    const nodeDescendants = descendants(node, topicGraph);
+
+    const hasProblemAncestor = nodeAncestors.some((ancestor) => ancestor.type === "problem");
+    const hasCriterionAncestor = nodeAncestors.some((ancestor) => ancestor.type === "criterion");
+    const hasSolutionDescendant = nodeDescendants.some(
+      (descendant) => descendant.type === "solution"
+    );
+    const hasCriterionDescendant = nodeDescendants.some(
+      (descendant) => descendant.type === "criterion"
+    );
+
+    // this implementation seems solid but if it becomes unperformant, it might be good enough to
+    // just check if this node has a "created by" vs "creates" relation
+    const shouldBeAboveCriteria = hasProblemAncestor && !hasCriterionAncestor; // problem is _not_ through criterion
+    const shouldBeBelowCriteria = hasSolutionDescendant && !hasCriterionDescendant; // solution is _not_ through criterion
+
+    if (shouldBeAboveCriteria && shouldBeBelowCriteria) return "null";
+    else if (shouldBeAboveCriteria) return "0";
     else return "2";
   } else {
     return partitionOrders[node.type];