From 8446f1e08f950fbbd3a49070f7bbe0dbf0db2b3e Mon Sep 17 00:00:00 2001
From: Stephan Richter <s.richter@srsoftware.de>
Date: Wed, 30 Jul 2025 21:00:18 +0200
Subject: [PATCH] implemented deletion and updating of notes

---
 frontend/src/App.svelte                       |  2 ++
 frontend/src/Components/Menu.svelte           | 15 +++++++---
 frontend/src/routes/notes/List.svelte         | 28 +++++++++++++------
 frontend/src/routes/project/Kanban.svelte     |  2 +-
 .../srsoftware/umbrella/notes/NoteModule.java | 13 ++++++---
 .../de/srsoftware/umbrella/notes/NotesDb.java | 12 ++++++++
 .../srsoftware/umbrella/notes/SqliteDb.java   | 17 ++++++++++-
 translations/src/main/resources/de.json       |  2 +-
 8 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 2a5cfed..b97b2a1 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -16,6 +16,7 @@
     import Login       from "./Components/Login.svelte";
     import Messages    from "./routes/message/Messages.svelte";
     import Menu        from "./Components/Menu.svelte";
+    import Notes       from "./routes/notes/List.svelte";
     import ProjectList from "./routes/project/List.svelte";
     import ProjectAdd  from "./routes/project/Create.svelte";
     import ResetPw     from "./routes/user/ResetPw.svelte";
@@ -53,6 +54,7 @@
             <Route path="/document/:id/send"           component={SendDoc} />
             <Route path="/document/:id/view"           component={ViewDoc} />
             <Route path="/message/settings"            component={Messages} />
+            <Route path="/notes"                       component={Notes} />
             <Route path="/project"                     component={ProjectList} />
             <Route path="/project/add"                 component={ProjectAdd} />
             <Route path="/project/:project_id/add_task" component={AddTask} />
diff --git a/frontend/src/Components/Menu.svelte b/frontend/src/Components/Menu.svelte
index 87d885c..d92c793 100644
--- a/frontend/src/Components/Menu.svelte
+++ b/frontend/src/Components/Menu.svelte
@@ -21,6 +21,12 @@ async function fetchModules(){
         console.log('error');
     }
 }
+
+function go(path){
+    router.navigate(path);
+    return false;
+}
+
 onMount(fetchModules);
 </script>
 
@@ -31,10 +37,11 @@ onMount(fetchModules);
 </style>
 
 <nav>
-    <a href="" onclick={() => router.navigate('/user')}>{t('users')}</a>
-    <a href="" onclick={() => router.navigate('/project')}>{t('projects')}</a>
-    <a href="" onclick={() => router.navigate('/task')}>{t('tasks')}</a>
-    <a href="" onclick={() => router.navigate('/document')}>{t('documents')}</a>
+    <a href="#" onclick={() => go('/user')}>{t('users')}</a>
+    <a href="#" onclick={() => go('/project')}>{t('projects')}</a>
+    <a href="#" onclick={() => go('/task')}>{t('tasks')}</a>
+    <a href="#" onclick={() => go('/document')}>{t('documents')}</a>
+    <a href="#" onclick={() => go('/notes')}>{t('notes')}</a>
     <a href="https://svelte.dev/tutorial/svelte/state" target="_blank">{t('tutorial')}</a>
     {#each modules as module,i}<a href={module.url}>{module.name}</a>{/each}
     {#if user.name }
diff --git a/frontend/src/routes/notes/List.svelte b/frontend/src/routes/notes/List.svelte
index f621d85..5ff4411 100644
--- a/frontend/src/routes/notes/List.svelte
+++ b/frontend/src/routes/notes/List.svelte
@@ -1,16 +1,18 @@
 <script>
-    import { onMount } from 'svelte';
+    import { onMount }       from 'svelte';
+    import { useTinyRouter } from 'svelte-tiny-router';
 
-    import { api }     from '../../urls.svelte.js';
-    import { t }       from '../../translations.svelte.js';
-    import { user }    from '../../user.svelte.js';
+    import { api }           from '../../urls.svelte.js';
+    import { t }             from '../../translations.svelte.js';
+    import { user }          from '../../user.svelte.js';
 
     import Editor from '../../Components/MarkdownEditor.svelte';
 
-    let authors = $state(null);
-    let error   = $state(null);
-    let note    = $state({source:null,rendered:null});
-    let notes   = $state(null);
+    let authors  = $state(null);
+    let error    = $state(null);
+    let note     = $state({source:null,rendered:null});
+    let notes    = $state(null);
+    const router = useTinyRouter();
     let {
         module = null,
         entity_id = null
@@ -31,8 +33,12 @@
         }
     }
 
+    function goToEntity(n){
+        router.navigate(`/${n.module}/${n.entity_id}/view`);
+    }
+
     async function load(){
-        const url  = api(`notes/${module}/${entity_id}`);
+        const url = (module == null && entity_id == null) ? api('notes') : api(`notes/${module}/${entity_id}`);
         const resp = await fetch(url,{credentials:'include'});
         if (resp.ok){
             const data = await resp.json();
@@ -99,7 +105,11 @@
 {#if notes}
 {#each Object.entries(notes) as [nid,note]}
 <fieldset>
+    {#if module}
     <legend class="author">{authors[note.user_id].name}</legend>
+    {:else}
+    <legend class="entity" onclick={() => goToEntity(note)}>{t(note.module)} {note.entity_id}</legend>
+    {/if}
     <legend class="time">
         {note.timestamp.replace('T',' ')}
         {#if user.id == note.user_id}
diff --git a/frontend/src/routes/project/Kanban.svelte b/frontend/src/routes/project/Kanban.svelte
index 64d501c..20b4cc6 100644
--- a/frontend/src/routes/project/Kanban.svelte
+++ b/frontend/src/routes/project/Kanban.svelte
@@ -186,7 +186,7 @@
 {#if ready}
 <div class="kanban" style="display: grid; grid-template-columns: {`repeat(${columns}, auto)`}">
     <span class="filter">
-        <input type="text" bind:value={filter_input} />
+        <input type="text" bind:value={filter_input} autofocus />
         {t('filter')}
     </span>
     <div class="head">{t('user')}</div>
diff --git a/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java b/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
index 0ee2927..d56cf46 100644
--- a/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
+++ b/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
@@ -77,10 +77,14 @@ public class NoteModule extends BaseHandler implements NoteService {
 			var user = users.refreshSession(ex);
 			if (user.isEmpty()) return unauthorized(ex);
 			var module = path.pop();
-			if (module == null) throw unprocessable("Module missing in path.");
-			var head = path.pop();
-			long entityId = Long.parseLong(head);
-			var notes = getNotes(module,entityId);
+			Map<Long,Note> notes = null;
+			if (module == null) {
+				notes = notesDb.list(user.get().id());
+			} else {
+				var head = path.pop();
+				long entityId = Long.parseLong(head);
+				notes = getNotes(module, entityId);
+			}
 			var authors = notes.values().stream().map(Note::authorId).distinct().map(users::loadUser).collect(Collectors.toMap(UmbrellaUser::id,UmbrellaUser::toMap));
 			return sendContent(ex, Map.of("notes",mapValues(notes),"authors",authors));
 		} catch (NumberFormatException e){
@@ -108,6 +112,7 @@ public class NoteModule extends BaseHandler implements NoteService {
 			String text = body(ex);
 			if (text.isBlank()) throw missingFieldException("Note text");
 			var note = notesDb.load(noteId);
+			if (note.authorId() != user.get().id()) throw forbidden("You are not allowed to edit notes of another user!");
 			note = new Note(note.id(),note.module(),note.entityId(),note.authorId(),text,LocalDateTime.now());
 			note = save(note);
 			return sendContent(ex,note);
diff --git a/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java b/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java
index b9ff479..e653302 100644
--- a/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java
+++ b/notes/src/main/java/de/srsoftware/umbrella/notes/NotesDb.java
@@ -10,6 +10,18 @@ public interface NotesDb {
 
 	void deleteEntity(String module, long entityId);
 
+	/**
+	 * get all lists of a person
+	 * @return
+	 */
+	Map<Long, Note> list(long authorId);
+
+	/**
+	 * get the notes related to a specific entity
+	 * @param module
+	 * @param entityId
+	 * @return
+	 */
 	Map<Long, Note> list(String module, long entityId);
 
 	Note load(long noteId);
diff --git a/notes/src/main/java/de/srsoftware/umbrella/notes/SqliteDb.java b/notes/src/main/java/de/srsoftware/umbrella/notes/SqliteDb.java
index acc522b..403fa23 100644
--- a/notes/src/main/java/de/srsoftware/umbrella/notes/SqliteDb.java
+++ b/notes/src/main/java/de/srsoftware/umbrella/notes/SqliteDb.java
@@ -16,7 +16,6 @@ import de.srsoftware.umbrella.core.model.Note;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 
 public class SqliteDb implements NotesDb {
@@ -112,6 +111,22 @@ CREATE TABLE IF NOT EXISTS "{0}" (
 		LOG.log(INFO,"Updated task db to version {0}",version);
 	}
 
+	@Override
+	public Map<Long, Note> list(long authorId) {
+		try {
+			var notes = new HashMap<Long, Note>();
+			var rs = select(ALL).from(TABLE_NOTES).where(USER_ID,equal(authorId)).exec(db);
+			while (rs.next()) {
+				var note = Note.of(rs);
+				notes.put(note.id(),note);
+			}
+			rs.close();
+			return notes;
+		} catch (SQLException e) {
+			throw new UmbrellaException("Failed to load notes");
+		}
+	}
+
 	@Override
 	public Map<Long, Note> list(String module, long entityId) {
 		try {
diff --git a/translations/src/main/resources/de.json b/translations/src/main/resources/de.json
index 83d68f9..9b0b867 100644
--- a/translations/src/main/resources/de.json
+++ b/translations/src/main/resources/de.json
@@ -51,7 +51,7 @@
   "delivery_date": "Lieferdatum",
   "description": "Beschreibung",
   "display_closed_tasks": "abgeschlossene Aufgaben anzeigen",
-  "document": "Dokumente",
+  "document": "Dokument",
   "document_list": "Dokumente",
   "documents": "Dokumente",
   "do_login" : "anmelden",