bug fix. When promoting to top level previously wasn't updating previ…

…ous parent correctly which could lead to data loss if that parent was then deleted
tconfrey · Oct 15, 2024 · a1344a9 · a1344a9
1 parent d243cfc
commit a1344a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/BTNode.js b/app/BTNode.js
@@ -162,16 +162,17 @@ class BTNode {
         if (newP == this._id) throw "reparentNode: setting self to parent!";
 
         const oldP = this.parentId;
-        if (!oldP || !newP) return;  // no parent to remove from
+        if (!oldP && !newP) return;             // nothing to do
         if (oldP === newP) {
             // Special case: new parent is the same as the old parent
             const parentNode = AllNodes[oldP];
             const oldIndex = parentNode.childIds.indexOf(this._id);
             arrayMoveElt(parentNode.childIds, oldIndex, index);
         } else {
-            AllNodes[oldP].removeChild(this.id);
+            // either old or newP might be null, ie at top level
+            oldP && AllNodes[oldP].removeChild(this.id);
             this.parentId = newP;
-            AllNodes[newP].addChild(this.id, index);
+            newP && AllNodes[newP].addChild(this.id, index);
         }
     }
 

diff --git a/versions/1.0.3/app/BTNode.js b/versions/1.0.3/app/BTNode.js
@@ -162,16 +162,17 @@ class BTNode {
         if (newP == this._id) throw "reparentNode: setting self to parent!";
 
         const oldP = this.parentId;
-        if (!oldP || !newP) return;  // no parent to remove from
+        if (!oldP && !newP) return;             // nothing to do
         if (oldP === newP) {
             // Special case: new parent is the same as the old parent
             const parentNode = AllNodes[oldP];
             const oldIndex = parentNode.childIds.indexOf(this._id);
             arrayMoveElt(parentNode.childIds, oldIndex, index);
         } else {
-            AllNodes[oldP].removeChild(this.id);
+            // either old or newP might be null, ie at top level
+            oldP && AllNodes[oldP].removeChild(this.id);
             this.parentId = newP;
-            AllNodes[newP].addChild(this.id, index);
+            newP && AllNodes[newP].addChild(this.id, index);
         }
     }