From 0ba0fa65f456d650605607e6ffe00bf96c3ff42c Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Wed, 12 Feb 2025 23:37:07 +0100
Subject: [PATCH] Prevent modification of notes directly

---
 gdn-app/src/components/CNavbar.vue | 13 +++++---
 gdn-app/src/components/CNote.vue   |  6 ++--
 gdn-app/src/stores/notes.ts        | 51 +++++++++++++++++++++++-------
 3 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/gdn-app/src/components/CNavbar.vue b/gdn-app/src/components/CNavbar.vue
index 7361434..e8b3e6a 100644
--- a/gdn-app/src/components/CNavbar.vue
+++ b/gdn-app/src/components/CNavbar.vue
@@ -18,7 +18,7 @@ const ui = useUiStore();
 
 function mkNote(text: string, ...children: string[]): Note {
   const note = notes.createNote(text);
-  children.forEach((it) => note.children.push(it));
+  for (const child of children) notes.addChild(note.id, child, -1);
   return note;
 }
 
@@ -40,10 +40,13 @@ function createSomeNotes(): void {
   ui.pushAnchorId(root.id);
 
   // Shuffle children of root
-  root.children = root.children
-    .map((it) => ({ it, rand: Math.random() }))
-    .sort((a, b) => a.rand - b.rand)
-    .map(({ it }) => it);
+  notes.setChildren(
+    root.id,
+    root.children
+      .map((it) => ({ it, rand: Math.random() }))
+      .sort((a, b) => a.rand - b.rand)
+      .map(({ it }) => it),
+  );
 }
 
 onMounted(() => {
diff --git a/gdn-app/src/components/CNote.vue b/gdn-app/src/components/CNote.vue
index 0c5a649..d01b538 100644
--- a/gdn-app/src/components/CNote.vue
+++ b/gdn-app/src/components/CNote.vue
@@ -129,7 +129,7 @@ function onEditEditorClose(): void {
 
 function onEditEditorFinish(text: string): void {
   if (!note.value) return;
-  note.value.text = text;
+  notes.setText(segment.id, text);
   onEditEditorClose();
 }
 
@@ -141,8 +141,8 @@ function onInsertEditorFinish(text: string): void {
   if (!note.value) return;
 
   if (insertIndex.value !== undefined) {
-    const childNote = notes.createNote(text);
-    note.value.children.splice(insertIndex.value, 0, childNote.id);
+    const child = notes.createNote(text);
+    notes.addChild(segment.id, child.id, insertIndex.value);
   }
 
   onInsertEditorClose();
diff --git a/gdn-app/src/stores/notes.ts b/gdn-app/src/stores/notes.ts
index d556fc0..c9b2b58 100644
--- a/gdn-app/src/stores/notes.ts
+++ b/gdn-app/src/stores/notes.ts
@@ -3,13 +3,19 @@ import { defineStore } from "pinia";
 import { computed, ref } from "vue";
 
 export interface Note {
+  readonly id: string;
+  readonly text: string;
+  readonly children: readonly string[];
+}
+
+interface MutNote {
   readonly id: string;
   text: string;
   children: string[];
 }
 
 export const useNotesStore = defineStore("notes", () => {
-  const notes = ref<Map<string, Note>>(new Map());
+  const notes = ref<Map<string, MutNote>>(new Map());
 
   const parents = computed(() => {
     const result = new Map<string, Set<string>>();
@@ -24,7 +30,14 @@ export const useNotesStore = defineStore("notes", () => {
   });
 
   function getNote(id: string): Note | undefined {
-    return notes.value.get(id);
+    const note = notes.value.get(id);
+    if (note === undefined) return;
+
+    return {
+      id,
+      text: note.text,
+      children: note.children.slice(),
+    };
   }
 
   function getParents(id: string): ReadonlySet<string> {
@@ -34,8 +47,7 @@ export const useNotesStore = defineStore("notes", () => {
   function createNote(text: string): Note {
     const id = crypto.randomUUID();
     notes.value.set(id, { id, text, children: [] });
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    return notes.value.get(id)!; // Re-getting so returned Note is reactive
+    return { id, text, children: [] };
   }
 
   function deleteNote(id: string): void {
@@ -46,16 +58,31 @@ export const useNotesStore = defineStore("notes", () => {
     notes.value.delete(id);
   }
 
-  function addChild(id: string, childId: string, index: number): void {
-    const note = getNote(id);
-    if (!note) return;
+  function setText(id: string, text: string): void {
+    const note = notes.value.get(id);
+    if (note === undefined) return;
 
+    note.text = text;
+  }
+
+  function setChildren(id: string, children: string[]): void {
+    const note = notes.value.get(id);
+    if (note === undefined) return;
+
+    note.children = children.slice();
+  }
+
+  function addChild(id: string, childId: string, index: number): void {
+    const note = notes.value.get(id);
+    if (note === undefined) return;
+
+    if (index < 0) index = note.children.length + 1 + index;
     note.children.splice(index, 0, childId);
   }
 
   function removeChild(id: string, segment: Segment): void {
-    const note = getNote(id);
-    if (!note) return;
+    const note = notes.value.get(id);
+    if (note === undefined) return;
 
     let index = note.children.indexOf(segment.id);
     for (let i = 0; i < segment.iteration; i++) {
@@ -67,10 +94,10 @@ export const useNotesStore = defineStore("notes", () => {
   }
 
   function moveChild(fromId: string, segment: Segment, toId: string, toIndex: number): void {
-    const from = getNote(fromId);
+    const from = notes.value.get(fromId);
     if (!from) return;
 
-    const to = getNote(toId);
+    const to = notes.value.get(toId);
     if (!to) return;
 
     // Find child index
@@ -96,6 +123,8 @@ export const useNotesStore = defineStore("notes", () => {
     getParents,
     createNote,
     deleteNote,
+    setText,
+    setChildren,
     addChild,
     removeChild,
     moveChild,