Merge branch 'bugfix/wikipage' into dev

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

.gitea/workflows/docker.yaml

@@ -41,6 +41,11 @@ jobs:
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
 
+      - name: Restart umbrella.srsoftware.de
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          curl -X POST -H "Authorization: Bearer ${{ secrets.ELDORADO_MAKE_BEARER }}" -d umbrella_25_start https://make.eldorado.srsoftware.de/launch
+
   Clean-Registry:
     runs-on: ubuntu-latest
     steps:

Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.22 AS svelte_build
-RUN apk add bash git npm
+RUN apk add npm
 RUN adduser -Dh /home/svelte svelte
 ADD . /home/svelte/Umbrella
 RUN chown -R svelte /home/svelte/Umbrella
@@ -9,7 +9,7 @@ RUN npm install && npm run build
 
 
 FROM alpine AS java_build
-RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
+RUN apk add gradle fontconfig font-opensans openjdk21-jre
 ADD . /Umbrella
 WORKDIR /Umbrella
 COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web

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

@@ -207,7 +207,7 @@ public final class Document implements Mappable {
 				case SENDER:         if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
 				case STATE:          state = State.of(json.getInt(key)).orElseThrow(() -> new UmbrellaException(HTTP_UNPROCESSABLE,"Invalid state")); break;
 				case POS:      if (json.get(key) instanceof JSONObject nested) positions.patch(nested); break;
-				case TEMPLATE_ID: if (json.get(key) instanceof String templateId) template = templateId; break;
+				case TEMPLATE: if (json.get(key) instanceof String templateId) template = templateId; break;
 				default:             key = null;
 			}
 			if (key != null) dirtyFields.add(key);

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

@@ -18,7 +18,7 @@ public class WikiPage implements Mappable {
 	private final long id;
 	private String title;
 	private int version;
-	private final List<Integer> versions = new ArrayList<>();
+	private final Set<Integer> versions = new TreeSet<>();
 	private final Map<Long,Member> members = new HashMap<>();
 	private String content;
 	private Set<String> dirtyFields = new HashSet<>();
@@ -157,7 +157,7 @@ public class WikiPage implements Mappable {
 		return version;
 	}
 
-	public List<Integer> versions(){
+	public Set<Integer> versions(){
 		return versions;
 	}
 }

frontend/src/routes/time/Index.svelte

@@ -20,7 +20,7 @@
     let projects = {};
     let project_filter = $state(null);
     if (router.hasQueryParam('project')) project_filter = router.getQueryParam('project');
-    let sortedTimes = $derived.by(() => Object.values(times).map(time => ({
+    let sortedTimes = $derived.by(() => Object.values(times).filter(match_prj_filter).map(time => ({
       ...time,
       start: display(time.start_time),
       end: display(time.end_time),
@@ -52,6 +52,7 @@
     }
 
     function calcYearMap(){
+        console.log('calcYearMap called');
         let result = {
             months : {},
             years  : {}
@@ -123,7 +124,7 @@
     function match_prj_filter(time){
         if (!project_filter) return true;
         for (var tid of time.task_ids){
-            if (project_filter == tasks[tid].project_id) return true;
+            if (tasks[tid] && project_filter == tasks[tid].project_id) return true;
         }
         return false;
     }
@@ -258,7 +259,6 @@
     </thead>
     <tbody>
         {#each sortedTimes as time,line}
-        {#if match_prj_filter(time)}
         <tr class={selected[time.id]?'selected':''}>
             {#if timeMap.years[line]}
             <td class="year" rowspan={timeMap.years[line]} onclick={e => toggleRange(time.start.substring(0,4))} title={time.start.substring(0,4)} >
@@ -321,7 +321,6 @@
             </td>
             {/if}
         </tr>
-        {/if}
         {/each}
     </tbody>
 </table>

frontend/src/routes/wiki/View.svelte

@@ -14,7 +14,7 @@
 
     let detail = $state(false);
     let { key, version } = $props();
-    let page = $state(null);
+    let page = $state({});
     let router = useTinyRouter();
     let members = $state({});
     let editable = $derived(page.members[user.id].permission.code<4);
@@ -72,9 +72,9 @@
 
     async function loadContent(res){
         if (res.ok){
-            page  = null;
-            page  = await res.json();
-            page.versions.sort((a,b)=>b-a);
+            let json  = await res.json();
+            json.versions.sort((a,b)=>b-a);
+            page = { ...json };
             yikes();
             return true;
         } else {
@@ -131,7 +131,7 @@
 
     $effect(loadPage);
 </script>
-{#if page}
+{#if page && page.versions}
 <div class="wiki page">
     <div class="versions">
         <span class="version">{t('version')}</span>

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

@@ -268,8 +268,10 @@ public class SqliteDb extends BaseDb implements WikiDb {
 	@Override
 	public WikiPage save(WikiPage page) {
 		try {
-			if (page.isDirty(CONTENT) || page.isDirty(ID) || page.isDirty(TITLE)) insertInto(TABLE_PAGES,ID,VERSION,TITLE,CONTENT)
-					.values(page.id(),page.version(),page.title(),page.content()).execute(db).close();
+			if (page.isDirty(CONTENT) || page.isDirty(ID) || page.isDirty(TITLE)) {
+				insertInto(TABLE_PAGES,ID,VERSION,TITLE,CONTENT).values(page.id(),page.version(),page.title(),page.content()).execute(db).close();
+				page.versions().add(page.version());
+			}
 			if (page.isDirty(MEMBERS)){
 				Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID, equal(page.id())).where(USER_ID,Condition.notIn(page.members().keySet().toArray())).execute(db);
 				var query = replaceInto(TABLE_PAGES_USERS,PAGE_ID,USER_ID,PERMISSIONS);