diff --git a/Svelte/Dockerfile b/Svelte/Dockerfile index 5be83cac..95abe102 100644 --- a/Svelte/Dockerfile +++ b/Svelte/Dockerfile @@ -1,7 +1,10 @@ FROM alpine:3.22 LABEL Maintainer "Stephan Richter " +ARG UID=1000 +ARG GID=1000 RUN apk add bash npm -RUN adduser -Dh /home/svelte svelte +RUN set -x; addgroup -g $GID svelte +RUN adduser -u $UID -G svelte -Dh /home/svelte svelte ADD script /opt USER svelte WORKDIR /home/svelte diff --git a/Svelte/Makefile b/Svelte/Makefile index a6320989..c5f4656a 100644 --- a/Svelte/Makefile +++ b/Svelte/Makefile @@ -1,16 +1,16 @@ default: devel build: image - docker run --name svelte-build \ + podman run --name svelte-build \ --rm \ -v ../frontend:/home/svelte/frontend \ -ti svelte /opt/svelte-build image: - docker build -t svelte . + podman build --build-arg UID=$$(id -u) --build-arg GID=$$(id -g) -t svelte . devel: image - -docker rm -f svelte - docker run --name svelte \ + -podman rm -f svelte + podman run --name svelte \ -v ../frontend:/home/svelte/frontend \ -p 5173:5173 \ -ti svelte /opt/svelte-init diff --git a/build.gradle.kts b/build.gradle.kts index c6b07d82..e78cfbb0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,7 +46,7 @@ subprojects { implementation("de.srsoftware:tools.mime:1.1.4") implementation("de.srsoftware:tools.logging:1.3.2") implementation("de.srsoftware:tools.optionals:1.0.0") - implementation("de.srsoftware:tools.util:2.0.4") + implementation("de.srsoftware:tools.util:2.1.1") implementation("org.json:json:20240303") } diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java index 4abdc2a1..d6861778 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/Event.java @@ -2,9 +2,9 @@ package de.srsoftware.umbrella.messagebus.events; import static de.srsoftware.umbrella.core.Constants.*; -import static java.text.MessageFormat.format; import static java.util.Optional.*; +import de.srsoftware.tools.Diff; import de.srsoftware.tools.Mappable; import de.srsoftware.umbrella.core.model.UmbrellaUser; import java.util.HashMap; @@ -45,11 +45,6 @@ public abstract class Event { public abstract String describe(); - private String diff(Map a, Map b){ - // TODO: replace by better implementation - return format("{0}\n→\n{1}",dropMarkdown(a),dropMarkdown(b)); - } - private Map dropMarkdown(Map map) { var result = new HashMap(); for (var entry : map.entrySet()){ @@ -61,7 +56,7 @@ public abstract class Event { } public Optional diff(){ - return oldData == null ? empty() : of(diff(oldData,payload.toMap())); + return oldData == null ? empty() : of(Diff.MapDiff.diff(dropMarkdown(oldData),dropMarkdown(payload.toMap()))); } diff --git a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java index 20d7adb3..434057de 100644 --- a/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java +++ b/bus/src/main/java/de/srsoftware/umbrella/messagebus/events/WikiEvent.java @@ -1,15 +1,12 @@ /* © SRSoftware 2025 */ package de.srsoftware.umbrella.messagebus.events; -import de.srsoftware.umbrella.core.model.Task; +import static de.srsoftware.umbrella.core.Constants.WIKI; + import de.srsoftware.umbrella.core.model.UmbrellaUser; import de.srsoftware.umbrella.core.model.WikiPage; - import java.util.Map; -import static de.srsoftware.umbrella.core.Constants.TASK; -import static de.srsoftware.umbrella.core.Constants.WIKI; - public class WikiEvent extends Event{ public WikiEvent(UmbrellaUser initiator, WikiPage page, EventType type){ diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 1261d8c9..51f91fa9 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -10,4 +10,4 @@ tasks.processResources { into("web") } duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} \ No newline at end of file +} diff --git a/wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java b/wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java index 17217a1b..50e3e47d 100644 --- a/wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java +++ b/wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java @@ -10,8 +10,8 @@ import static de.srsoftware.umbrella.core.Util.mapValues; import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*; import static de.srsoftware.umbrella.core.model.Permission.EDIT; import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY; -import static de.srsoftware.umbrella.wiki.Constants.*; import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus; +import static de.srsoftware.umbrella.wiki.Constants.*; import com.sun.net.httpserver.HttpExchange; import de.srsoftware.configuration.Configuration; @@ -22,7 +22,6 @@ import de.srsoftware.umbrella.core.api.WikiService; import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.*; import de.srsoftware.umbrella.messagebus.events.WikiEvent; - import java.io.IOException; import java.util.Arrays; import java.util.Optional;