Merge branch 'main' into module/journal

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

.gitea/workflows/docker.yaml

@@ -53,10 +53,8 @@ jobs:
         run: |
           TAGS="$(curl -s -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/tags/list | jq -r ".tags[]")"
           COUNT=$(echo "$TAGS" | wc -l)
-          echo found $COUNT tags: $TAGS
           if [ $COUNT -gt 10 ]; then
             REMAIN=$((COUNT - 10))
-            echo $REMAIN tags will be kept!
             echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
           else
             echo less than 10 tags, skipping cleanup

core/src/main/java/de/srsoftware/umbrella/core/model/IdOrString.java

@@ -1,13 +1,14 @@
 /* © SRSoftware 2025 */
 package de.srsoftware.umbrella.core.model;
 
-import static de.srsoftware.tools.Optionals.isSet;
-
 import de.srsoftware.tools.Mappable;
 import de.srsoftware.umbrella.core.constants.Field;
 import java.util.HashMap;
 import java.util.Map;
 
+import static de.srsoftware.tools.Optionals.isSet;
+import static de.srsoftware.tools.Optionals.nullIfEmpty;
+
 public class IdOrString implements Mappable {
 		private final Long id;
 		private final String value;

frontend/src/Components/MarkdownEditor.svelte

@@ -155,7 +155,7 @@
     {/if}
 {:else}
     <Display classes={{editable}} markdown={value} {onclick} {oncontextmenu} title={t('right_click_to_edit')} wrapper={type} />
-    {#if !value.rendered}
+    {#if !value.display}
     <button onclick={oncontextmenu}>{t('add_object',{object:t('content')})}</button>
     {/if}
 {/if}

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());