fixed tagging

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

.gitea/workflows/docker.yaml

@@ -14,7 +14,8 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build docker image
-        run: docker build -t umbrella .
+        run: |
+          docker build -t umbrella .          
 
       - name: Store tag date
         run: |
@@ -40,37 +41,3 @@ jobs:
           TAG=$(cat /tmp/tag)
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
-
-      - name: Restart vj.srsoftware.de
-        if: github.ref == 'refs/heads/main'
-        run: |
-          curl -X POST -H "Authorization: Bearer ${{ secrets.MAKE_BEARER }}" -d vj_start https://make.srsoftware.de/launch
-
-  Clean-Registry:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get tag list
-        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)
-          if [ $COUNT -gt 10 ]; then
-            REMAIN=$((COUNT - 10))
-            echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
-          else
-            echo less than 10 tags, skipping cleanup
-            echo "" > /tmp/old_tags
-          fi
-
-      - name: Remove tags
-        run: |
-          cat /tmp/old_tags | while read TAG; do
-            if [ -n "$TAG" ]; then
-              DIGEST=$(curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' -o /dev/null -w '%header{Docker-Content-Digest}' https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$TAG)
-              if [ -n "$DIGEST" ]; then
-                echo about to delete $TAG
-                curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -X DELETE https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$DIGEST
-              else
-                echo failed to get digest for $TAG
-              fi
-            fi
-          done

Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.22 AS svelte_build
-RUN apk add npm
+RUN apk add bash git npm
 RUN adduser -Dh /home/svelte svelte
 ADD . /home/svelte/Umbrella
 RUN chown -R svelte /home/svelte/Umbrella
@@ -8,14 +8,20 @@ WORKDIR /home/svelte/Umbrella/frontend
 RUN npm install && npm run build
 
 
+
+
+
 FROM alpine AS java_build
-RUN apk add gradle fontconfig font-opensans openjdk21-jre
+RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
 ADD . /Umbrella
 WORKDIR /Umbrella
 COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
 RUN gradle --no-daemon build
 
 
+
+
+
 FROM alpine
 RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint
 RUN adduser -D umbrella
@@ -27,3 +33,4 @@ WORKDIR /home/umbrella
 RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
 EXPOSE 80
 CMD java -jar jar/backend.jar
+

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: if (json.get(key) instanceof String templateId) template = templateId; break;
+				case TEMPLATE_ID: 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/Translatable.java

@@ -1,38 +0,0 @@
-package de.srsoftware.umbrella.core.model;
-
-import de.srsoftware.umbrella.core.ModuleRegistry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class Translatable {
-	private final String message;
-	private Map<String, Object> fills;
-	private final HashMap<String,String> translated = new HashMap<>();
-
-	public Translatable(String message, Map<String,Object> fills){
-		this.fills   = fills;
-		this.message = message;
-	}
-
-	public String translate(String language){
-		var translation = translated.get(language);
-		if (translation == null){
-			var translatedFills = new HashMap<String,String>();
-			if (fills != null) {
-				for (var entry : fills.entrySet()) {
-					var o = entry.getValue();
-					var val = switch (o) {
-						case Translatable tr -> tr.translate(language);
-						case String s -> s;
-						default -> o.toString();
-					};
-					translatedFills.put(entry.getKey(), val);
-				}
-			}
-			translation = ModuleRegistry.translator().translate(language,message,translatedFills);
-			translated.put(language,translation);
-		}
-		return translation;
-	}
-}

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 Set<Integer> versions = new TreeSet<>();
+	private final List<Integer> versions = new ArrayList<>();
 	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 Set<Integer> versions(){
+	public List<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).filter(match_prj_filter).map(time => ({
+    let sortedTimes = $derived.by(() => Object.values(times).map(time => ({
       ...time,
       start: display(time.start_time),
       end: display(time.end_time),
@@ -52,7 +52,6 @@
     }
 
     function calcYearMap(){
-        console.log('calcYearMap called');
         let result = {
             months : {},
             years  : {}
@@ -124,7 +123,7 @@
     function match_prj_filter(time){
         if (!project_filter) return true;
         for (var tid of time.task_ids){
-            if (tasks[tid] && project_filter == tasks[tid].project_id) return true;
+            if (project_filter == tasks[tid].project_id) return true;
         }
         return false;
     }
@@ -259,6 +258,7 @@
     </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,6 +321,7 @@
             </td>
             {/if}
         </tr>
+        {/if}
         {/each}
     </tbody>
 </table>

frontend/src/routes/wiki/GuestView.svelte

@@ -1,6 +1,4 @@
 <script>
-	import Login       from "../../Components/Login.svelte";
-
     import { onMount }       from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
     import { api }           from '../../urls.svelte';
@@ -47,4 +45,3 @@
     </div>
 </div>
 {/if}
-<Login />

frontend/src/routes/wiki/View.svelte

@@ -14,7 +14,7 @@
 
     let detail = $state(false);
     let { key, version } = $props();
-    let page = $state({});
+    let page = $state(null);
     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){
-            let json  = await res.json();
-            json.versions.sort((a,b)=>b-a);
-            page = { ...json };
+            page  = null;
+            page  = await res.json();
+            page.versions.sort((a,b)=>b-a);
             yikes();
             return true;
         } else {
@@ -131,7 +131,7 @@
 
     $effect(loadPage);
 </script>
-{#if page && page.versions}
+{#if page}
 <div class="wiki page">
     <div class="versions">
         <span class="version">{t('version')}</span>

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

@@ -268,10 +268,8 @@ 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();
-				page.versions().add(page.version());
-			}
+			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(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);