From 1d9057f2d9cb39d8f3ffd3403aee3f0588fb1f27 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Wed, 30 Aug 2023 02:31:49 +0200
Subject: feat(frontend): hide isolated nodes

---
 subprojects/frontend/src/graph/dotSource.ts      | 43 ++++++++++++++++--------
 subprojects/frontend/src/graph/postProcessSVG.ts |  4 ++-
 2 files changed, 32 insertions(+), 15 deletions(-)

(limited to 'subprojects/frontend')

diff --git a/subprojects/frontend/src/graph/dotSource.ts b/subprojects/frontend/src/graph/dotSource.ts
index 701453f4..963a9663 100644
--- a/subprojects/frontend/src/graph/dotSource.ts
+++ b/subprojects/frontend/src/graph/dotSource.ts
@@ -40,6 +40,7 @@ function relationName(graph: GraphStore, metadata: RelationMetadata): string {
 }
 
 interface NodeData {
+  isolated: boolean;
   exists: string;
   equalsSelf: string;
   unaryPredicates: Map<RelationMetadata, string>;
@@ -51,27 +52,35 @@ function computeNodeData(graph: GraphStore): NodeData[] {
   } = graph;
 
   const nodeData = Array.from(Array(nodes.length)).map(() => ({
+    isolated: true,
     exists: 'FALSE',
     equalsSelf: 'FALSE',
     unaryPredicates: new Map(),
   }));
 
   relations.forEach((relation) => {
-    if (relation.arity !== 1) {
-      return;
-    }
     const visibility = graph.getVisibility(relation.name);
     if (visibility === 'none') {
       return;
     }
+    const { arity } = relation;
     const interpretation = partialInterpretation[relation.name] ?? [];
-    interpretation.forEach(([index, value]) => {
-      if (
-        typeof index === 'number' &&
-        typeof value === 'string' &&
-        (visibility === 'all' || value !== 'UNKNOWN')
-      ) {
-        nodeData[index]?.unaryPredicates?.set(relation, value);
+    interpretation.forEach((tuple) => {
+      const value = tuple[arity];
+      if (visibility !== 'all' && value === 'UNKNOWN') {
+        return;
+      }
+      for (let i = 0; i < arity; i += 1) {
+        const index = tuple[i];
+        if (typeof index === 'number') {
+          const data = nodeData[index];
+          if (data !== undefined) {
+            data.isolated = false;
+            if (arity === 1) {
+              data.unaryPredicates.set(relation, value);
+            }
+          }
+        }
       }
     });
   });
@@ -109,12 +118,18 @@ function createNodes(graph: GraphStore, lines: string[]): void {
 
   nodes.forEach((node, i) => {
     const data = nodeData[i];
-    if (data === undefined) {
+    if (data === undefined || data.isolated) {
       return;
     }
-    const classes = [
-      `node-${node.kind} node-exists-${data.exists} node-equalsSelf-${data.equalsSelf}`,
-    ].join(' ');
+    const classList = [
+      `node-${node.kind}`,
+      `node-exists-${data.exists}`,
+      `node-equalsSelf-${data.equalsSelf}`,
+    ];
+    if (data.unaryPredicates.size === 0) {
+      classList.push('node-empty');
+    }
+    const classes = classList.join(' ');
     const name = nodeName(graph, node);
     const border = node.kind === 'INDIVIDUAL' ? 2 : 1;
     lines.push(`n${i} [id="${node.name}", class="${classes}", label=<
diff --git a/subprojects/frontend/src/graph/postProcessSVG.ts b/subprojects/frontend/src/graph/postProcessSVG.ts
index 13e4eb29..a580f5c6 100644
--- a/subprojects/frontend/src/graph/postProcessSVG.ts
+++ b/subprojects/frontend/src/graph/postProcessSVG.ts
@@ -62,7 +62,9 @@ function clipCompartmentBackground(node: SVGGElement) {
   modifyAttribute(compartment, 'y', -5);
   modifyAttribute(compartment, 'x', -5);
   modifyAttribute(compartment, 'width', 10);
-  modifyAttribute(compartment, 'height', 5);
+  const isEmpty = node.classList.contains('node-empty');
+  // Make sure that empty nodes are fully filled.
+  modifyAttribute(compartment, 'height', isEmpty ? 10 : 5);
   if (node.classList.contains('node-equalsSelf-UNKNOWN')) {
     addShadow(node, container, 6);
   }
-- 
cgit v1.2.3-54-g00ecf