From 8435b5ae3dd7d67f9051c5ce07a06a0acb52b0c7 Mon Sep 17 00:00:00 2001
From: Ross Keenan <rossk29@gmail.com>
Date: Fri, 19 Nov 2021 17:53:13 +0200
Subject: [PATCH] fix: :bug: Fail safe on adding all nodes to main

---
 main.js           | 21 ++++++++++++---------
 src/MatrixView.ts |  7 ++-----
 src/main.ts       | 17 ++++++++++-------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/main.js b/main.js
index e98ed052..7c5c4479 100644
--- a/main.js
+++ b/main.js
@@ -22546,13 +22546,11 @@ class MatrixView extends obsidian.ItemView {
             return hierData;
         });
         debug(settings, { data });
-        const hierSquares = this.getHierSquares(userHierarchies, data, currFile, settings);
-        debug(settings, { hierSquares });
-        const filteredSquaresArr = hierSquares.filter((squareArr) => squareArr.some((square) => square.realItems.length + square.impliedItems.length > 0));
+        const hierSquares = this.getHierSquares(userHierarchies, data, currFile, settings).filter((squareArr) => squareArr.some((square) => square.realItems.length + square.impliedItems.length > 0));
         const compInput = {
             target: contentEl,
             props: {
-                filteredSquaresArr,
+                filteredSquaresArr: hierSquares,
                 currFile,
                 settings,
                 matrixView: this,
@@ -35427,16 +35425,16 @@ class BCPlugin extends obsidian.Plugin {
         return hierarchyNoteItems;
     }
     // SECTION OneSource
-    populateGraph(g, currFileName, fieldValues, dir, fieldName) {
+    populateGraph(g, currFileName, targets, dir, fieldName) {
         //@ts-ignore
         addNodeIfNot(g, currFileName, { dir, fieldName });
         if (fieldName === "")
             return;
-        fieldValues.forEach((value) => {
+        targets.forEach((target) => {
             //@ts-ignore
-            addNodeIfNot(g, value, { dir, fieldName });
+            addNodeIfNot(g, target, { dir, fieldName });
             //@ts-ignore
-            addEdgeIfNot(g, currFileName, value, { dir, fieldName });
+            addEdgeIfNot(g, currFileName, target, { dir, fieldName });
         });
     }
     populateMain(main, currFileName, dir, fieldName, targets, neighbours, neighbourObjArr) {
@@ -35517,7 +35515,6 @@ class BCPlugin extends obsidian.Plugin {
                     new obsidian.Notice(`${note} is no longer in your vault. It is best to remove it in Breadcrumbs settings.`);
                 }
             }
-            debug(settings, { hierarchyNotesArr });
         }
         debugGroupEnd(settings, "debugMode");
         const { userHierarchies } = settings;
@@ -35619,6 +35616,12 @@ class BCPlugin extends obsidian.Plugin {
         debug(settings, "graphs inited");
         debug(settings, { graphs });
         debugGroupEnd(settings, "debugMode");
+        files.forEach((file) => {
+            if (!graphs.main.hasNode(file.basename)) {
+                console.log(`${file.basename} was not in main`);
+                graphs.main.addNode(file.basename);
+            }
+        });
         return graphs;
     }
     // !SECTION OneSource
diff --git a/src/MatrixView.ts b/src/MatrixView.ts
index 31541afb..dee9b31d 100644
--- a/src/MatrixView.ts
+++ b/src/MatrixView.ts
@@ -477,10 +477,7 @@ export default class MatrixView extends ItemView {
       data,
       currFile,
       settings
-    );
-    debug(settings, { hierSquares });
-
-    const filteredSquaresArr = hierSquares.filter((squareArr) =>
+    ).filter((squareArr) =>
       squareArr.some(
         (square) => square.realItems.length + square.impliedItems.length > 0
       )
@@ -489,7 +486,7 @@ export default class MatrixView extends ItemView {
     const compInput = {
       target: contentEl,
       props: {
-        filteredSquaresArr,
+        filteredSquaresArr: hierSquares,
         currFile,
         settings,
         matrixView: this,
diff --git a/src/main.ts b/src/main.ts
index 5c93bc58..666133a6 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -333,7 +333,7 @@ export default class BCPlugin extends Plugin {
   populateGraph(
     g: Graph,
     currFileName: string,
-    fieldValues: string[],
+    targets: string[],
     dir: Directions,
     fieldName: string
   ): void {
@@ -341,11 +341,11 @@ export default class BCPlugin extends Plugin {
     addNodeIfNot(g, currFileName, { dir, fieldName });
 
     if (fieldName === "") return;
-    fieldValues.forEach((value) => {
+    targets.forEach((target) => {
       //@ts-ignore
-      addNodeIfNot(g, value, { dir, fieldName });
+      addNodeIfNot(g, target, { dir, fieldName });
       //@ts-ignore
-      addEdgeIfNot(g, currFileName, value, { dir, fieldName });
+      addEdgeIfNot(g, currFileName, target, { dir, fieldName });
     });
   }
 
@@ -455,8 +455,6 @@ export default class BCPlugin extends Plugin {
           );
         }
       }
-
-      debug(settings, { hierarchyNotesArr });
     }
     debugGroupEnd(settings, "debugMode");
 
@@ -603,7 +601,12 @@ export default class BCPlugin extends Plugin {
     debug(settings, { graphs });
 
     debugGroupEnd(settings, "debugMode");
-
+    files.forEach((file) => {
+      if (!graphs.main.hasNode(file.basename)) {
+        console.log(`${file.basename} was not in main`);
+        graphs.main.addNode(file.basename);
+      }
+    });
     return graphs;
   }