www.spaceplanner.app

commit 912a720fd3d9d848d7b0babd24948d65dae47ef4
parent 09e8edbe10fbc19abbad1d3c49873417cad39fa6
Author: Jacob R. Edwards <jacob@jacobedwards.org>
Date:   Fri, 13 Sep 2024 10:16:03 -0700

Fix oldValue not being set on remove in History

This meant that you couldn't reverse removals, which is obviously
a problem.

Diffstat:
M
files/floorplans/floorplan/backend.js
 | 
36
++++++++++++++++++++----------------

1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/files/floorplans/floorplan/backend.js b/files/floorplans/floorplan/backend.js
@@ -89,35 +89,38 @@ class BackendHistory {
 		}
 
 		let oldValue
-		if (op === "add") {
-			for (let i = this.place; !oldValue && i >= 0; --i) {
-				if (this.diffs[i].path === path) {
-					if (this.diffs[i].op === "remove") {
-						throw new Error("Cannot reuse old ID")
-					}
-
-					oldValue = this.diffs[i].value
+		for (let i = this.place; !oldValue && i >= 0; --i) {
+			if (this.diffs[i].path === path) {
+				if (this.diffs[i].op === "remove") {
+					throw new Error("Cannot reuse old ID")
 				}
-			}
-			if (oldValue) {
-				op = "replace"
-			} else {
-				op = "new"
+				oldValue = this.diffs[i].value
 			}
 		}
 
+		if (op === "add") {
+			op = oldValue ? "replace" : "new"
+		} else {
+			if (oldValue == null) {
+				throw new Error("Remove requires oldValue")
+			}
+		}
+			
 		let diff = {
 			type: "diff",
 			op: op,
 			path: path,
 			time: Date.now()
 		}
+
 		if (value) {
 			diff.value = structuredClone(value)
 		}
+
 		if (oldValue) {
 			diff.oldValue = structuredClone(oldValue)
 		}
+
 		if (!options.clean) {
 			diff.dirty = true
 		}
@@ -235,7 +238,8 @@ class BackendHistory {
 
 		if (diff.op === "new") {
 			diff.op = "remove"
-			diff.value = null
+			diff.oldValue = diff.value
+			delete diff.value
 		} else if (diff.op === "replace") {
 			let t = diff.value
 			diff.value = diff.oldValue
@@ -244,11 +248,11 @@ class BackendHistory {
 			if (!diff.oldValue) {
 				throw new Error("There should be an old value")
 			}
-			diff.op = "add"
+			diff.op = "new"
 			diff.value = diff.oldValue
 			delete diff.oldValue
 		} else {
-			throw new Error("Unsupported operation")
+			throw new Error(diff.op + ": Unsupported operation")
 		}
 
 		return diff