replacing site-local error display by global error display

This commit is contained in:
2025-09-26 15:27:20 +02:00
parent 2a6392cd2b
commit e3b735bb7b
16 changed files with 62 additions and 66 deletions

View File

@@ -49,7 +49,7 @@
location.href = endpoint + '?' + new URLSearchParams(json); location.href = endpoint + '?' + new URLSearchParams(json);
} }
} else { } else {
error(await resp.text()); error(resp);
if (btn) btn.disabled = false; if (btn) btn.disabled = false;
} }
} }

View File

@@ -40,7 +40,7 @@
Object.entries(input).map(([key, value]) => [key, value.name]) Object.entries(input).map(([key, value]) => [key, value.name])
); );
} else { } else {
error(await resp.text()); error(resp);
return {}; return {};
} }
} }
@@ -58,7 +58,7 @@
yikes(); yikes();
if (Object.keys(raw).length) onscroll(null); // when bookmarks were received, check whether they fill up the page if (Object.keys(raw).length) onscroll(null); // when bookmarks were received, check whether they fill up the page
} else { } else {
error(await resp.html()) error(resp)
} }
} }
@@ -81,7 +81,7 @@
const bookmark = await resp.json(); const bookmark = await resp.json();
bookmarks.unshift(bookmark); bookmarks.unshift(bookmark);
} else { } else {
error(await resp.text()); error(resp);
} }
} }

View File

@@ -20,7 +20,7 @@
bookmark = await resp.json(); bookmark = await resp.json();
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp.text);
} }
} }

View File

@@ -26,7 +26,7 @@
Object.entries(input).map(([key, value]) => [key, value.name]) Object.entries(input).map(([key, value]) => [key, value.name])
); );
} else { } else {
error(await resp.text()); error(resp);
return {}; return {};
} }
} }
@@ -43,7 +43,7 @@
for (let key of Object.keys(patched)) company[key] = patched[key]; for (let key of Object.keys(patched)) company[key] = patched[key];
return true; return true;
} }
error(await resp.text()) error(resp);
return false; return false;
} }

View File

@@ -25,7 +25,7 @@
companies[company.id] = company; companies[company.id] = company;
yikes(); yikes();
} else { } else {
error(await resp.text()) error(resp);
} }
} }
@@ -52,7 +52,7 @@
companies = await resp.json(); companies = await resp.json();
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp);
} }
} }

View File

@@ -28,10 +28,10 @@
projects = await resp.json(); projects = await resp.json();
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp);
} }
} else { } else {
error(await resp.text()); error(resp);
} }
} }

View File

@@ -43,7 +43,7 @@
project.allowed_states[json.code] = json.name; project.allowed_states[json.code] = json.name;
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -92,7 +92,7 @@
yikes(); yikes();
loadTasks(); loadTasks();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -113,7 +113,7 @@
tasks = await resp.json(); tasks = await resp.json();
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -138,7 +138,7 @@
project = await resp.json(); project = await resp.json();
return true; return true;
} else { } else {
error(await resp.text()); error(resp);
return false; return false;
} }
} }

View File

@@ -39,7 +39,7 @@
const track = await resp.json(); const track = await resp.json();
timetrack.running = track; timetrack.running = track;
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -53,7 +53,7 @@
if (resp.ok){ if (resp.ok){
deleted = true; deleted = true;
} else { } else {
error(await resp.text()) error(resp);
} }
} }
} }
@@ -78,7 +78,7 @@
children[dragged.element.id]=dragged.element; children[dragged.element.id]=dragged.element;
if (dragged.siblings[dragged.element.id]) delete dragged.siblings[dragged.element.id]; if (dragged.siblings[dragged.element.id]) delete dragged.siblings[dragged.element.id];
} else { } else {
error(await resp.text()); error(resp);
} }
return false; return false;
} }
@@ -99,7 +99,7 @@
children = await resp.json(); children = await resp.json();
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -121,7 +121,7 @@
task = await resp.json(); task = await resp.json();
return true; return true;
} else { } else {
error(await resp.text()); error(resp);
return false; return false;
} }
} }

View File

@@ -30,7 +30,7 @@
await patch(); await patch();
delete candidates[new_task_id]; delete candidates[new_task_id];
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -52,7 +52,7 @@
for (var taskId of Object.keys(requiredTasks)) delete candidates[taskId]; for (var taskId of Object.keys(requiredTasks)) delete candidates[taskId];
delete candidates[task.id]; delete candidates[task.id];
} else { } else {
error(await res.text()); error(resp);
} }
} }
@@ -68,7 +68,7 @@
yikes(); yikes();
requiredTasks = await res.json(); requiredTasks = await res.json();
} else { } else {
error(await res.text()); error(resp);
} }
} }
@@ -91,7 +91,7 @@
method : 'PATCH', method : 'PATCH',
body : JSON.stringify({required_tasks_ids:task.required_tasks_ids}) 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){ async function unlink(required_task){

View File

@@ -49,7 +49,7 @@
timetrack.running = track; timetrack.running = track;
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -90,7 +90,7 @@
children = await resp.json(); children = await resp.json();
yikes(); yikes();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -100,7 +100,7 @@
if (resp.ok){ if (resp.ok){
task.parent = await resp.json(); task.parent = await resp.json();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -116,7 +116,7 @@
if (task.project_id) loadProject(); if (task.project_id) loadProject();
if (task.parent_task_id) loadParent(); if (task.parent_task_id) loadParent();
} else { } else {
error(await resp.text()); error(resp);
} }
} }
@@ -149,7 +149,7 @@
if (task.parent_id == old_task.parent_id) task.parent = old_task.parent; if (task.parent_id == old_task.parent_id) task.parent = old_task.parent;
return true; return true;
} else { } else {
error(await resp.text()); error(resp);
return false; return false;
} }
} }

View File

@@ -64,7 +64,7 @@
yikes(); yikes();
router.navigate('/user'); router.navigate('/user');
} else { } else {
error(await resp.text()); error(resp);
caption = t('failed'); caption = t('failed');
sent = false; sent = false;
} }

View File

@@ -1,12 +1,12 @@
<script> <script>
import { useTinyRouter } from 'svelte-tiny-router'; import { useTinyRouter } from 'svelte-tiny-router';
import { api } from '../../urls.svelte'; import { api } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte'; import { t } from '../../translations.svelte';
import Markdown from '../../Components/MarkdownEditor.svelte'; import Markdown from '../../Components/MarkdownEditor.svelte';
let content = $state({source:null,rendered:null}); let content = $state({source:null,rendered:null});
let error = $state(null);
let router = useTinyRouter(); let router = useTinyRouter();
let timer = null; let timer = null;
let title = $state(null); let title = $state(null);
@@ -21,9 +21,10 @@
body:content.source body:content.source
}); });
if (res.ok){ if (res.ok){
yikes();
router.navigate(`/wiki/${title}/view`); router.navigate(`/wiki/${title}/view`);
} else { } else {
error = await res.text(); error(res);
} }
} }
@@ -40,10 +41,11 @@
var res = await fetch(url,{credentials:'include'}); var res = await fetch(url,{credentials:'include'});
const body = await res.text(); const body = await res.text();
if (res.ok){ 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 { } else {
error = body; error(body ? body : t('failed_to_check_availability'));
if (!error) error = t('failed_to_check_availability');
} }
} }
@@ -51,9 +53,6 @@
</script> </script>
<h1>{t('create_new_object',{object:t('page')})}</h1> <h1>{t('create_new_object',{object:t('page')})}</h1>
{#if error}
<span class="error">{error}</span>
{/if}
<form {onsubmit}> <form {onsubmit}>
<label> <label>
{t('Name')} {t('Name')}

View File

@@ -2,12 +2,11 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router'; import { useTinyRouter } from 'svelte-tiny-router';
import { api } from '../../urls.svelte'; import { api } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte'; import { t } from '../../translations.svelte';
let { key } = $props(); let { key } = $props();
let error = $state(null);
let page = $state(null); let page = $state(null);
let router = useTinyRouter(); let router = useTinyRouter();
@@ -15,10 +14,10 @@
if (res.ok){ if (res.ok){
page = null; page = null;
page = await res.json(); page = await res.json();
error = null; yikes();
return true; return true;
} else { } else {
error = await res.text(); error(res);
return false; return false;
} }
} }
@@ -38,9 +37,6 @@
$effect(loadPage); $effect(loadPage);
</script> </script>
{#if error}
<span class="error">{error}</span>
{/if}
{#if page} {#if page}
<div class="wiki page"> <div class="wiki page">
<h2>{page.title}</h2> <h2>{page.title}</h2>

View File

@@ -2,9 +2,9 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router'; import { useTinyRouter } from 'svelte-tiny-router';
import { api } from '../../urls.svelte'; import { api } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte'; import { t } from '../../translations.svelte';
let error = $state(null);
let lastLetter = null; let lastLetter = null;
let pages = $state(null); let pages = $state(null);
let router = useTinyRouter(); let router = useTinyRouter();
@@ -21,17 +21,15 @@
const res = await fetch(url,{credentials:'include'}); const res = await fetch(url,{credentials:'include'});
if (res.ok){ if (res.ok){
pages = await res.json(); pages = await res.json();
yikes();
} else { } else {
error = await res.text(); error(res);
} }
} }
onMount(loadPageList); onMount(loadPageList);
</script> </script>
{#if error}
<span class="error">{error}</span>
{/if}
<h1>{t('wiki')}</h1> <h1>{t('wiki')}</h1>
<button onclick={() => router.navigate('/wiki/add')}><span class="symbol"></span> {t('create_new_object',{object:t('page')})}</button> <button onclick={() => router.navigate('/wiki/add')}><span class="symbol"></span> {t('create_new_object',{object:t('page')})}</button>

View File

@@ -2,6 +2,7 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router'; import { useTinyRouter } from 'svelte-tiny-router';
import { api } from '../../urls.svelte'; import { api } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte'; import { t } from '../../translations.svelte';
import { user } from '../../user.svelte'; import { user } from '../../user.svelte';
@@ -12,7 +13,6 @@
import TagList from '../tags/TagList.svelte'; import TagList from '../tags/TagList.svelte';
let detail = $state(false); let detail = $state(false);
let error = $state(null);
let { key, version } = $props(); let { key, version } = $props();
let page = $state(null); let page = $state(null);
let router = useTinyRouter(); let router = useTinyRouter();
@@ -45,8 +45,9 @@
if (res.ok){ if (res.ok){
let json = await res.json(); let json = await res.json();
router.navigate(`/wiki/${page.id}/view`); router.navigate(`/wiki/${page.id}/view`);
yikes();
} else { } else {
error = await res.text(); error(res);
} }
} }
@@ -74,10 +75,10 @@
page = null; page = null;
page = await res.json(); page = await res.json();
page.versions.sort((a,b)=>b-a); page.versions.sort((a,b)=>b-a);
error = null; yikes();
return true; return true;
} else { } else {
error = await res.text(); error(res);
return false; return false;
} }
} }
@@ -130,9 +131,6 @@
$effect(loadPage); $effect(loadPage);
</script> </script>
{#if error}
<span class="error">{error}</span>
{/if}
{#if page} {#if page}
<div class="wiki page"> <div class="wiki page">
<div class="versions"> <div class="versions">

View File

@@ -1,11 +1,16 @@
export const messages = $state({error:null,warning:null}); export const messages = $state({error:null,warning:null});
export function error(msg){ async function process(msg){
messages.error = msg; if (msg instanceof Response) return await msg.text();
return msg;
} }
export function warn(msg){ export async function error(msg){
messages.warning = msg; messages.error = await process(msg);
}
export async function warn(msg){
messages.warning = await process(msg);
} }
export function yikes(){ export function yikes(){