From e3b735bb7b9be1c62f2a6b41152c85b5cf98b201 Mon Sep 17 00:00:00 2001
From: Stephan Richter <s.richter@srsoftware.de>
Date: Fri, 26 Sep 2025 15:27:20 +0200
Subject: [PATCH] replacing site-local error display by global error display

---
 frontend/src/Components/Login.svelte          |  2 +-
 frontend/src/routes/bookmark/Index.svelte     |  6 +++---
 frontend/src/routes/bookmark/View.svelte      |  4 ++--
 frontend/src/routes/company/Editor.svelte     |  6 +++---
 frontend/src/routes/company/Index.svelte      |  6 +++---
 frontend/src/routes/project/List.svelte       |  4 ++--
 frontend/src/routes/project/View.svelte       |  8 ++++----
 frontend/src/routes/task/ListTask.svelte      | 10 +++++-----
 frontend/src/routes/task/RequiredTasks.svelte |  8 ++++----
 frontend/src/routes/task/View.svelte          | 10 +++++-----
 frontend/src/routes/user/EditUser.svelte      |  2 +-
 frontend/src/routes/wiki/AddPage.svelte       | 15 +++++++--------
 frontend/src/routes/wiki/GuestView.svelte     | 10 +++-------
 frontend/src/routes/wiki/Index.svelte         | 12 +++++-------
 frontend/src/routes/wiki/View.svelte          | 12 +++++-------
 frontend/src/warn.svelte.js                   | 13 +++++++++----
 16 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/frontend/src/Components/Login.svelte b/frontend/src/Components/Login.svelte
index edcbeb5..86f22fe 100644
--- a/frontend/src/Components/Login.svelte
+++ b/frontend/src/Components/Login.svelte
@@ -49,7 +49,7 @@
                 location.href = endpoint + '?' + new URLSearchParams(json);
             }
         } else {
-            error(await resp.text());
+            error(resp);
             if (btn) btn.disabled = false;
         }
     }
diff --git a/frontend/src/routes/bookmark/Index.svelte b/frontend/src/routes/bookmark/Index.svelte
index b52e133..31baa91 100644
--- a/frontend/src/routes/bookmark/Index.svelte
+++ b/frontend/src/routes/bookmark/Index.svelte
@@ -40,7 +40,7 @@
                 Object.entries(input).map(([key, value]) => [key, value.name])
             );
         } else {
-            error(await resp.text());
+            error(resp);
             return {};
         }
     }
@@ -58,7 +58,7 @@
             yikes();
             if (Object.keys(raw).length) onscroll(null); // when bookmarks were received, check whether they fill up the page
         } else {
-            error(await resp.html())
+            error(resp)
         }
     }
 
@@ -81,7 +81,7 @@
             const bookmark = await resp.json();
             bookmarks.unshift(bookmark);
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
diff --git a/frontend/src/routes/bookmark/View.svelte b/frontend/src/routes/bookmark/View.svelte
index 4f49cfd..3b10b46 100644
--- a/frontend/src/routes/bookmark/View.svelte
+++ b/frontend/src/routes/bookmark/View.svelte
@@ -20,11 +20,11 @@
             bookmark = await resp.json();
             yikes();
         } else {
-            error(await resp.text());
+            error(resp.text);
         }
     }
 
     onMount(load);
 </script>
 
-<Template {bookmark} />
\ No newline at end of file
+<Template {bookmark} />
diff --git a/frontend/src/routes/company/Editor.svelte b/frontend/src/routes/company/Editor.svelte
index 3e56507..833c841 100644
--- a/frontend/src/routes/company/Editor.svelte
+++ b/frontend/src/routes/company/Editor.svelte
@@ -26,7 +26,7 @@
                 Object.entries(input).map(([key, value]) => [key, value.name])
             );
         } else {
-            error(await resp.text());
+            error(resp);
             return {};
         }
     }
@@ -43,7 +43,7 @@
             for (let key of Object.keys(patched)) company[key] = patched[key];
             return true;
         }
-        error(await resp.text())
+        error(resp);
         return false;
     }
 
@@ -107,4 +107,4 @@
     <button onclick={saveUsers} disabled={!btnEnabled} >{caption}</button>
 </fieldset>
 {/if}
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/frontend/src/routes/company/Index.svelte b/frontend/src/routes/company/Index.svelte
index 7307c7d..44e426d 100644
--- a/frontend/src/routes/company/Index.svelte
+++ b/frontend/src/routes/company/Index.svelte
@@ -25,7 +25,7 @@
             companies[company.id] = company;
             yikes();
         } else {
-            error(await resp.text())
+            error(resp);
         }
     }
 
@@ -52,7 +52,7 @@
             companies = await resp.json();
             yikes();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -131,4 +131,4 @@
         </tbody>
     </table>
     {/if}
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/frontend/src/routes/project/List.svelte b/frontend/src/routes/project/List.svelte
index 031094d..f2a4b56 100644
--- a/frontend/src/routes/project/List.svelte
+++ b/frontend/src/routes/project/List.svelte
@@ -28,10 +28,10 @@
                 projects = await resp.json();
                 yikes();
             } else {
-                error(await resp.text());
+	        error(resp);
             }
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
diff --git a/frontend/src/routes/project/View.svelte b/frontend/src/routes/project/View.svelte
index a26af11..307447c 100644
--- a/frontend/src/routes/project/View.svelte
+++ b/frontend/src/routes/project/View.svelte
@@ -43,7 +43,7 @@
             project.allowed_states[json.code] = json.name;
             yikes();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -92,7 +92,7 @@
             yikes();
             loadTasks();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -113,7 +113,7 @@
             tasks              = await resp.json();
             yikes();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -138,7 +138,7 @@
             project = await resp.json();
             return true;
         } else {
-            error(await resp.text());
+            error(resp);
             return false;
         }
     }
diff --git a/frontend/src/routes/task/ListTask.svelte b/frontend/src/routes/task/ListTask.svelte
index 504c7ea..e0d2104 100644
--- a/frontend/src/routes/task/ListTask.svelte
+++ b/frontend/src/routes/task/ListTask.svelte
@@ -39,7 +39,7 @@
             const track = await resp.json();
             timetrack.running = track;
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -53,7 +53,7 @@
             if (resp.ok){
                 deleted = true;
             } else {
-                error(await resp.text())
+	        error(resp);
             }
         }
     }
@@ -78,7 +78,7 @@
             children[dragged.element.id]=dragged.element;
             if (dragged.siblings[dragged.element.id]) delete dragged.siblings[dragged.element.id];
         } else {
-            error(await resp.text());
+            error(resp);
         }
         return false;
     }
@@ -99,7 +99,7 @@
             children = await resp.json();
             yikes();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -121,7 +121,7 @@
             task = await resp.json();
             return true;
         } else {
-            error(await resp.text());
+            error(resp);
             return false;
         }
     }
diff --git a/frontend/src/routes/task/RequiredTasks.svelte b/frontend/src/routes/task/RequiredTasks.svelte
index a2f9766..cac031a 100644
--- a/frontend/src/routes/task/RequiredTasks.svelte
+++ b/frontend/src/routes/task/RequiredTasks.svelte
@@ -30,7 +30,7 @@
             await patch();
             delete candidates[new_task_id];
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -52,7 +52,7 @@
             for (var taskId of Object.keys(requiredTasks)) delete candidates[taskId];
             delete candidates[task.id];
         } else {
-            error(await res.text());
+            error(resp);
         }
     }
 
@@ -68,7 +68,7 @@
             yikes();
             requiredTasks = await res.json();
         } else {
-            error(await res.text());
+            error(resp);
         }
     }
 
@@ -91,7 +91,7 @@
                 method      : 'PATCH',
                 body        : JSON.stringify({required_tasks_ids:task.required_tasks_ids})
             });
-            if (!resp.ok) error(await resp.text());
+            if (!resp.ok) error(resp);
     }
 
     async function unlink(required_task){
diff --git a/frontend/src/routes/task/View.svelte b/frontend/src/routes/task/View.svelte
index 142b26f..1947426 100644
--- a/frontend/src/routes/task/View.svelte
+++ b/frontend/src/routes/task/View.svelte
@@ -49,7 +49,7 @@
             timetrack.running = track;
             yikes();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -90,7 +90,7 @@
             children = await resp.json();
             yikes();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -100,7 +100,7 @@
         if (resp.ok){
             task.parent = await resp.json();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -116,7 +116,7 @@
             if (task.project_id) loadProject();
             if (task.parent_task_id) loadParent();
         } else {
-            error(await resp.text());
+            error(resp);
         }
     }
 
@@ -149,7 +149,7 @@
             if (task.parent_id == old_task.parent_id) task.parent = old_task.parent;
             return true;
         } else {
-            error(await resp.text());
+            error(resp);
             return false;
         }
     }
diff --git a/frontend/src/routes/user/EditUser.svelte b/frontend/src/routes/user/EditUser.svelte
index 8dfb3de..698b674 100644
--- a/frontend/src/routes/user/EditUser.svelte
+++ b/frontend/src/routes/user/EditUser.svelte
@@ -64,7 +64,7 @@
             yikes();
             router.navigate('/user');
         } else {
-            error(await resp.text());
+            error(resp);
             caption = t('failed');
             sent = false;
         }
diff --git a/frontend/src/routes/wiki/AddPage.svelte b/frontend/src/routes/wiki/AddPage.svelte
index 8510146..da9c441 100644
--- a/frontend/src/routes/wiki/AddPage.svelte
+++ b/frontend/src/routes/wiki/AddPage.svelte
@@ -1,12 +1,12 @@
 <script>
     import { useTinyRouter } from 'svelte-tiny-router';
     import { api }           from '../../urls.svelte';
+    import { error, yikes }  from '../../warn.svelte';
     import { t }             from '../../translations.svelte';
 
     import Markdown          from '../../Components/MarkdownEditor.svelte';
 
     let content = $state({source:null,rendered:null});
-    let error   = $state(null);
     let router  = useTinyRouter();
     let timer   = null;
     let title   = $state(null);
@@ -21,9 +21,10 @@
             body:content.source
         });
         if (res.ok){
+            yikes();
             router.navigate(`/wiki/${title}/view`);
         } else {
-            error = await res.text();
+            error(res);
         }
     }
 
@@ -40,10 +41,11 @@
         var res = await fetch(url,{credentials:'include'});
         const body = await res.text();
         if (res.ok){
-            error = body == 'true' ? null : t('title_not_available',{title:title})
+            if (body == 'true') {
+                yikes();
+            } else error(t('title_not_available',{title:title}));
         } else {
-            error = body;
-            if (!error) error = t('failed_to_check_availability');
+            error(body ? body : t('failed_to_check_availability'));
         }
     }
 
@@ -51,9 +53,6 @@
 </script>
 
 <h1>{t('create_new_object',{object:t('page')})}</h1>
-{#if error}
-<span class="error">{error}</span>
-{/if}
 <form {onsubmit}>
     <label>
         {t('Name')}
diff --git a/frontend/src/routes/wiki/GuestView.svelte b/frontend/src/routes/wiki/GuestView.svelte
index cc9dc6d..72f9b4c 100644
--- a/frontend/src/routes/wiki/GuestView.svelte
+++ b/frontend/src/routes/wiki/GuestView.svelte
@@ -2,12 +2,11 @@
     import { onMount }       from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
     import { api }           from '../../urls.svelte';
+    import { error, yikes }  from '../../warn.svelte';
     import { t }             from '../../translations.svelte';
 
     let { key } = $props();
 
-
-    let error = $state(null);
     let page = $state(null);
     let router = useTinyRouter();
 
@@ -15,10 +14,10 @@
         if (res.ok){
             page  = null;
             page  = await res.json();
-            error = null;
+            yikes();
             return true;
         } else {
-            error = await res.text();
+            error(res);
             return false;
         }
     }
@@ -38,9 +37,6 @@
 
     $effect(loadPage);
 </script>
-{#if error}
-<span class="error">{error}</span>
-{/if}
 {#if page}
 <div class="wiki page">
     <h2>{page.title}</h2>
diff --git a/frontend/src/routes/wiki/Index.svelte b/frontend/src/routes/wiki/Index.svelte
index 7c9cedf..d983f81 100644
--- a/frontend/src/routes/wiki/Index.svelte
+++ b/frontend/src/routes/wiki/Index.svelte
@@ -1,10 +1,10 @@
 <script>
     import { onMount }  from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
-    import { api }      from '../../urls.svelte';
-    import { t }        from '../../translations.svelte';
+    import { api }           from '../../urls.svelte';
+    import { error, yikes }  from '../../warn.svelte';
+    import { t }             from '../../translations.svelte';
 
-    let error      = $state(null);
     let lastLetter = null;
     let pages      = $state(null);
     let router     = useTinyRouter();
@@ -21,17 +21,15 @@
         const res = await fetch(url,{credentials:'include'});
         if (res.ok){
             pages = await res.json();
+            yikes();
         } else {
-            error = await res.text();
+            error(res);
         }
     }
 
     onMount(loadPageList);
 </script>
 
-{#if error}
-<span class="error">{error}</span>
-{/if}
 <h1>{t('wiki')}</h1>
 <button onclick={() => router.navigate('/wiki/add')}><span class="symbol"></span> {t('create_new_object',{object:t('page')})}</button>
 
diff --git a/frontend/src/routes/wiki/View.svelte b/frontend/src/routes/wiki/View.svelte
index 4b0c123..c93182b 100644
--- a/frontend/src/routes/wiki/View.svelte
+++ b/frontend/src/routes/wiki/View.svelte
@@ -2,6 +2,7 @@
     import { onMount }       from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
     import { api }           from '../../urls.svelte';
+    import { error, yikes }  from '../../warn.svelte';
     import { t }             from '../../translations.svelte';
     import { user }          from '../../user.svelte';
 
@@ -12,7 +13,6 @@
     import TagList           from '../tags/TagList.svelte';
 
     let detail = $state(false);
-    let error = $state(null);
     let { key, version } = $props();
     let page = $state(null);
     let router = useTinyRouter();
@@ -45,8 +45,9 @@
         if (res.ok){
             let json = await res.json();
             router.navigate(`/wiki/${page.id}/view`);
+            yikes();
         } else {
-            error = await res.text();
+            error(res);
         }
     }
 
@@ -74,10 +75,10 @@
             page  = null;
             page  = await res.json();
             page.versions.sort((a,b)=>b-a);
-            error = null;
+            yikes();
             return true;
         } else {
-            error = await res.text();
+            error(res);
             return false;
         }
     }
@@ -130,9 +131,6 @@
 
     $effect(loadPage);
 </script>
-{#if error}
-<span class="error">{error}</span>
-{/if}
 {#if page}
 <div class="wiki page">
     <div class="versions">
diff --git a/frontend/src/warn.svelte.js b/frontend/src/warn.svelte.js
index 32d011c..176b350 100644
--- a/frontend/src/warn.svelte.js
+++ b/frontend/src/warn.svelte.js
@@ -1,11 +1,16 @@
 export const messages = $state({error:null,warning:null});
 
-export function error(msg){
-    messages.error = msg;
+async function process(msg){
+    if (msg instanceof Response) return await msg.text();
+    return msg;
 }
 
-export function warn(msg){
-    messages.warning = msg;
+export async function error(msg){
+    messages.error = await process(msg);
+}
+
+export async function warn(msg){
+    messages.warning = await process(msg);
 }
 
 export function yikes(){