implemented event-based page-refresh for wiki pages
This commit is contained in:
@@ -0,0 +1,35 @@
|
|||||||
|
/* © SRSoftware 2025 */
|
||||||
|
package de.srsoftware.umbrella.messagebus.events;
|
||||||
|
|
||||||
|
import de.srsoftware.umbrella.core.model.Task;
|
||||||
|
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<WikiPage>{
|
||||||
|
public WikiEvent(UmbrellaUser initiator, WikiPage page, EventType type){
|
||||||
|
super(initiator, WIKI, page, type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WikiEvent(UmbrellaUser initiator, WikiPage page, Map<String, Object> oldData){
|
||||||
|
super(initiator, WIKI, page, oldData);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String describe() {
|
||||||
|
return diff().orElse("[TODO: WikiEvent.describe()]");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isIntendedFor(UmbrellaUser user) {
|
||||||
|
for (var member : payload().members().values()){
|
||||||
|
if (member.user().equals(user)) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -160,4 +160,5 @@ public class Constants {
|
|||||||
public static final String VERSION = "version";
|
public static final String VERSION = "version";
|
||||||
public static final String VERSIONS = "versions";
|
public static final String VERSIONS = "versions";
|
||||||
|
|
||||||
|
public static final String WIKI = "wiki";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<script>
|
<script>
|
||||||
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, eventStream } from '../../urls.svelte';
|
||||||
import { error, yikes } from '../../warn.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';
|
||||||
@@ -13,6 +13,7 @@
|
|||||||
import TagList from '../tags/TagList.svelte';
|
import TagList from '../tags/TagList.svelte';
|
||||||
|
|
||||||
let detail = $state(false);
|
let detail = $state(false);
|
||||||
|
let eventSource = null;
|
||||||
let { key, version } = $props();
|
let { key, version } = $props();
|
||||||
let page = $state({});
|
let page = $state({});
|
||||||
let router = useTinyRouter();
|
let router = useTinyRouter();
|
||||||
@@ -27,6 +28,10 @@
|
|||||||
return patch({members:newMembers});
|
return patch({members:newMembers});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function connectToBus(){
|
||||||
|
eventSource = eventStream(null,handleUpdateEvent,null);
|
||||||
|
}
|
||||||
|
|
||||||
async function dropMember(member){
|
async function dropMember(member){
|
||||||
var id = member.user.id;
|
var id = member.user.id;
|
||||||
let newMembers = JSON.parse(JSON.stringify(page.members));
|
let newMembers = JSON.parse(JSON.stringify(page.members));
|
||||||
@@ -51,6 +56,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleUpdateEvent(evt){
|
||||||
|
let json = JSON.parse(evt.data);
|
||||||
|
if (json.wikipage) loadContent(json.wikipage);
|
||||||
|
}
|
||||||
|
|
||||||
function nonMember(json){
|
function nonMember(json){
|
||||||
return !page.members[json.id];
|
return !page.members[json.id];
|
||||||
}
|
}
|
||||||
@@ -70,11 +80,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadContent(res){
|
function loadContent(json){
|
||||||
|
json.versions.sort((a,b)=>b-a);
|
||||||
|
page = { ...json };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadJson(res){
|
||||||
if (res.ok){
|
if (res.ok){
|
||||||
let json = await res.json();
|
let json = await res.json();
|
||||||
json.versions.sort((a,b)=>b-a);
|
loadContent(json);
|
||||||
page = { ...json };
|
|
||||||
yikes();
|
yikes();
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
@@ -88,7 +102,7 @@
|
|||||||
if (version) path += `/version/${version}`;
|
if (version) path += `/version/${version}`;
|
||||||
const url = api(path);
|
const url = api(path);
|
||||||
const res = await fetch(url,{credentials:'include'});
|
const res = await fetch(url,{credentials:'include'});
|
||||||
loadContent(res);
|
loadJson(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onclick(e){
|
function onclick(e){
|
||||||
@@ -105,7 +119,7 @@
|
|||||||
method:'PATCH',
|
method:'PATCH',
|
||||||
body:JSON.stringify(data)
|
body:JSON.stringify(data)
|
||||||
});
|
});
|
||||||
return loadContent(res);
|
return loadJson(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function patchGuestPermissions(ev){
|
async function patchGuestPermissions(ev){
|
||||||
@@ -130,6 +144,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$effect(loadPage);
|
$effect(loadPage);
|
||||||
|
onMount(connectToBus);
|
||||||
</script>
|
</script>
|
||||||
{#if page && page.versions}
|
{#if page && page.versions}
|
||||||
<div class="wiki page">
|
<div class="wiki page">
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
description = "Umbrella : Wiki"
|
description = "Umbrella : Wiki"
|
||||||
|
|
||||||
dependencies{
|
dependencies{
|
||||||
|
implementation(project(":bus"))
|
||||||
implementation(project(":core"))
|
implementation(project(":core"))
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,7 @@ 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.EDIT;
|
||||||
import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
|
import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
|
||||||
import static de.srsoftware.umbrella.wiki.Constants.*;
|
import static de.srsoftware.umbrella.wiki.Constants.*;
|
||||||
|
import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
|
||||||
|
|
||||||
import com.sun.net.httpserver.HttpExchange;
|
import com.sun.net.httpserver.HttpExchange;
|
||||||
import de.srsoftware.configuration.Configuration;
|
import de.srsoftware.configuration.Configuration;
|
||||||
@@ -20,6 +21,8 @@ import de.srsoftware.umbrella.core.BaseHandler;
|
|||||||
import de.srsoftware.umbrella.core.api.WikiService;
|
import de.srsoftware.umbrella.core.api.WikiService;
|
||||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||||
import de.srsoftware.umbrella.core.model.*;
|
import de.srsoftware.umbrella.core.model.*;
|
||||||
|
import de.srsoftware.umbrella.messagebus.events.WikiEvent;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -190,10 +193,13 @@ public class WikiModule extends BaseHandler implements WikiService {
|
|||||||
private boolean patchPage(Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
|
private boolean patchPage(Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
|
||||||
var id = path.pop();
|
var id = path.pop();
|
||||||
var page = loadPage(id, null);
|
var page = loadPage(id, null);
|
||||||
|
var old = page.toMap();
|
||||||
var member = page.members().get(user.id());
|
var member = page.members().get(user.id());
|
||||||
if (member == null || member.permission() != EDIT) throw forbidden("You are not allowed to edit {0}!",id);
|
if (member == null || member.permission() != EDIT) throw forbidden("You are not allowed to edit {0}!",id);
|
||||||
var json = json(ex);
|
var json = json(ex);
|
||||||
return sendContent(ex,wikiDb.save(page.patch(json, userService())));
|
page = wikiDb.save(page.patch(json, userService()));
|
||||||
|
messageBus().dispatch(new WikiEvent(user,page,old));
|
||||||
|
return sendContent(ex,page);
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean postNewPage(String title, UmbrellaUser user, HttpExchange ex) throws IOException {
|
private boolean postNewPage(String title, UmbrellaUser user, HttpExchange ex) throws IOException {
|
||||||
|
|||||||
Reference in New Issue
Block a user