Merge branch 'main' into module/journal

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

frontend/src/routes/stock/Index.svelte

@@ -241,7 +241,7 @@
 </script>
 
 <h2>{t('Stock')}</h2>
-<div class="grid3">
+<div class="stock grid3">
     <div class="locations">
         {#if top_level}
         {#each top_level as realm,idx}
@@ -278,11 +278,11 @@
     </div>
     {#if item && data && data.users}
     <div class="tags">
-        <span>{t('tags')}</span>
+        <h4>{t('tags')}</h4>
         <Tags module="stock" id={item.id} user_list={data.users} />
     </div>
     <div class="notes">
-        <span>{t('notes')}</span>
+        <h4>{t('notes')}</h4>
         <Notes module="stock" entity_id={item.id} />
     </div>
     {/if}

frontend/src/routes/tags/TagList.svelte

@@ -88,7 +88,7 @@
     }
 
     async function onCommit(wrapped){
-        addTag(wrapped.display);
+        addTag(wrapped.display.trim());
     }
 
     function onSelect(dummy){}

frontend/src/routes/wiki/View.svelte

@@ -1,7 +1,7 @@
 <script>
     import { onMount }       from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
-    import { api, eventStream } from '../../urls.svelte';
+    import { api, eventStream, get } from '../../urls.svelte';
     import { error, yikes }  from '../../warn.svelte';
     import { t }             from '../../translations.svelte';
     import { user }          from '../../user.svelte';
@@ -48,8 +48,13 @@
         });
         if (res.ok){
             let json = await res.json();
-            router.navigate(`/wiki/${page.id}/view`);
-            yikes();
+            let target = `/wiki/${page.id}/view`;
+            if (window.location.pathname == target) {
+                loadPage();
+            } else {
+                router.navigate(target);
+                yikes();
+            }
         } else {
             error(res);
         }
@@ -100,7 +105,7 @@
         let path = `wiki/page/${key}`;
         if (version) path += `/version/${version}`;
         const url = api(path);
-        const res = await fetch(url,{credentials:'include'});
+        const res = await get(url);
         loadJson(res);
     }
 
@@ -145,6 +150,11 @@
     $effect(loadPage);
 	onMount(connectToBus);
 </script>
+
+<svelte:head>
+    <title>Umbrella – {t('wiki')}: {page?.title}</title>
+</svelte:head>
+
 {#if page && page.versions}
 <div class="wiki page">
     <div class="versions">
@@ -188,7 +198,10 @@
     {/if}
     {/if}
     <MarkdownEditor {editable} value={page.content} onSet={s => patch({content:s})} store_id="wiki/{page.id}/description" />
-    <TagList module="wiki" id={page.id} user_list={Object.keys(page.members).map(id => +id)} />
+    <div class="tags">
+        <h3>{t('tags')}</h3>
+        <TagList module="wiki" id={page.id} user_list={Object.keys(page.members).map(id => +id)} />
+    </div>
     <div class="notes">
         <h3>{t('notes')}</h3>
         <Notes module="wiki" entity_id={page.id} />

journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java

@@ -13,6 +13,8 @@ import de.srsoftware.umbrella.core.BaseDb;
 import de.srsoftware.umbrella.messagebus.events.Event;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
 public class SqliteDb extends BaseDb implements JournalDb{
 	public SqliteDb(Connection connection) {
@@ -33,13 +35,14 @@ public class SqliteDb extends BaseDb implements JournalDb{
 		var sql = """
 				CREATE TABLE IF NOT EXISTS {0} (
 					{1} INTEGER PRIMARY KEY,
-					{2} INTEGER,
-					{3} VARCHAR(255) NOT NULL,
-					{4} VARCHAR(16) NOT NULL,
-					{5} TEXT
+					{2} LONG NOT NULL,
+					{3} INTEGER,
+					{4} VARCHAR(255) NOT NULL,
+					{5} VARCHAR(16) NOT NULL,
+					{6} TEXT
 				);
 				""";
-		sql = format(sql,TABLE_JOURNAL,ID,USER_ID,MODULE,ACTION,DESCRIPTION);
+		sql = format(sql,TABLE_JOURNAL,ID,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION);
 		try {
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
@@ -50,8 +53,9 @@ public class SqliteDb extends BaseDb implements JournalDb{
 	@Override
 	public void logEvent(Event<?> event) {
 		try {
-			insertInto(TABLE_JOURNAL,USER_ID,MODULE,ACTION,DESCRIPTION)
-					.values(event.initiator().id(), event.module(), event.eventType(), event.describe())
+			var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+			insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION)
+					.values(timestamp,event.initiator().id(), event.module(), event.eventType(), event.describe())
 					.execute(db).close();
 		} catch (SQLException e) {
 			throw databaseException(ERROR_WRITE_EVENT,event.eventType(),event.initiator().name());

tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java

@@ -144,7 +144,7 @@ public class TagModule extends BaseHandler implements TagService {
 
 	@Override
 	public void save(String module, long entityId, Collection<Long> userIds, Collection<String> tags) {
-		tagDb.save(userIds,module,entityId,tags);
+		tagDb.save(userIds,module,entityId,tags.stream().map(String::trim).toList());
 	}
 
 	@Override

web/src/main/resources/web/css/default.css

@@ -524,6 +524,10 @@ a.wikilink{
     grid-template-columns: [left] 1fr [first] 1fr [second] 1fr [right]
 }
 
+.stock.grid3{
+	grid-template-columns: [left] 1fr [first] 1fr [second] 2fr [right]
+}
+
 .grid3 .locations {
     grid-row-end: span 3;
 }