SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

working on legacy note rendering

Browse Source
This commit is contained in:
Stephan Richter
2025-08-13 08:50:54 +02:00
parent 85ae67b72f
commit 65701dee74
3 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/routes/notes/Index.svelte
View File

@@ -12,7 +12,7 @@
let error = $state(null); let error = $state(null);
let loader = { let loader = {
offset : 0, offset : 0,
limit : 5, limit : 20,
active : true active : true
} }
let note = $state({source:null,rendered:null}); let note = $state({source:null,rendered:null});

1
legacy/build.gradle.kts
View File

@@ -4,6 +4,7 @@ dependencies{
implementation(project(":core")) implementation(project(":core"))
implementation(project(":user")) implementation(project(":user"))
implementation("de.srsoftware:tools.mime:1.1.2") implementation("de.srsoftware:tools.mime:1.1.2")
implementation("de.srsoftware:tools.web:1.3.16")
implementation("org.bitbucket.b_c:jose4j:0.9.6") implementation("org.bitbucket.b_c:jose4j:0.9.6")
implementation("org.xerial:sqlite-jdbc:3.49.0.0") implementation("org.xerial:sqlite-jdbc:3.49.0.0")
} }

49
legacy/src/main/java/de/srsoftware/umbrella/legacy/NotesLegacy.java
View File

@@ -1,16 +1,25 @@
/* © SRSoftware 2025 */ /* © SRSoftware 2025 */
package de.srsoftware.umbrella.legacy; package de.srsoftware.umbrella.legacy;
import static de.srsoftware.umbrella.core.Constants.URI;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.unprocessable;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import de.srsoftware.configuration.Configuration; import de.srsoftware.configuration.Configuration;
import de.srsoftware.tools.Path; import de.srsoftware.tools.Path;
import de.srsoftware.tools.Tag;
import de.srsoftware.umbrella.core.BaseHandler; import de.srsoftware.umbrella.core.BaseHandler;
import de.srsoftware.umbrella.core.ModuleRegistry; import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import static de.srsoftware.umbrella.core.Constants.URI;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.Util.markdown;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.invalidFieldException;
public class NotesLegacy extends BaseHandler { public class NotesLegacy extends BaseHandler {
private final ModuleRegistry registry; private final ModuleRegistry registry;
@@ -43,15 +52,29 @@ public class NotesLegacy extends BaseHandler {
@Override @Override
public boolean doPost(Path path, HttpExchange ex) throws IOException { public boolean doPost(Path path, HttpExchange ex) throws IOException {
addCors(ex); var params = formData(ex);
var data = formData(ex); if (!(params.get(URI) instanceof String uri)) throw invalidFieldException(URI,"URI of the form \"module:entry-id\"");
var noteService = registry.noteService(); var parts = uri.split(":");
if (!(data.get(URI) instanceof String uri)) throw missingFieldException(URI); if (parts.length<2) throw invalidFieldException(URI,"URI of the form \"module:entry-id\"");
var parts = uri.split(":",2); var module = parts[0];
if (parts.length<2) throw unprocessable("Expected URI to contain colon (:)!"); var entryId = parts[1];
String module = parts[0]; var notes = registry.noteService().getNotes(module,entryId);
String entityId = parts[1]; var authors = new HashMap<Long, UmbrellaUser> ();
var notes = noteService.getNotes(module,entityId); var users = registry.userService();
return super.doPost(path, ex); for (var note : notes.values()) {
var userId = note.authorId();
authors.computeIfAbsent(userId,k -> users.loadUser(userId));
}
var html = new Tag("div");
for (var note : notes.values()){
var author = authors.get(note.authorId());
var authorName = author != null ? author.name() : "";
new Tag("fieldset")
.add(new Tag("legend").content(authorName))
.add(new Tag("legend").content(note.timestamp().format(DateTimeFormatter.ISO_DATE_TIME)))
.add(new Tag("div").content(markdown(note.text())))
.addTo(html);
}
return sendContent(ex,html.toString(2));
} }
} }