Update .gitea/workflows/deploy.yml

.gitea/workflows/build.yml

@@ -5,7 +5,7 @@ on:
       - '*'
 jobs:
   build:
-    runs-on: standard-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitea/workflows/deploy.yml

@@ -1,11 +1,12 @@
 name: Deploy
 on:
   push:
-    tags:
+    branches:
-      - 'v*'
+      - master
+
 jobs:
   build:
-    runs-on: standard-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -18,10 +19,10 @@ jobs:
           cache: 'gradle'
 
       - name: Build Jar
-        run: ./gradlew bootJar
+        run: ./gradlew bootJar --no-daemon
 
       - name: Build Container
-        run: docker build --tag gitea.seeseepuff.be/seeseemelk/pcinv:${{github.ref_name}} .
+        run: docker build --tag gitea.seeseepuff.be/seeseemelk/pcinv:latest .
 
       - name: Login
         with: # Set the secret as an input
@@ -29,4 +30,4 @@ jobs:
         run: docker login gitea.seeseepuff.be -u seeseemelk -p ${{ secrets.PACKAGE_RW }}
 
       - name: Push Container
-        run: docker push gitea.seeseepuff.be/seeseemelk/pcinv:${{github.ref_name}}
+        run: docker push gitea.seeseepuff.be/seeseemelk/pcinv:latest

src/main/java/be/seeseepuff/pcinv/controllers/WebController.java

@@ -96,7 +96,10 @@ public class WebController {
         model.addAttribute(DESCRIPTORS, tree);
         model.addAttribute(PROPERTIES, tree.stream().flatMap(d -> d.getProperties().stream()).toList());
         var assets = assetService.getAssetsByType(type);
-        assets.sort(Comparator.comparing(Asset::getQr));
+        assets.sort(Comparator
+                .comparing((Asset a) -> a.getAsset().getBrand(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing((Asset a) -> a.getAsset().getModel(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(Asset::getQr));
         model.addAttribute(ASSETS, assets);
         return "browse_type";
     }

src/main/resources/templates/browse_type.html

@@ -9,7 +9,8 @@
         <tr th:each="a : ${assets}">
             <td th:each="p : ${properties}" th:if="${!p.hideInOverview}">
                 <a th:if="${p.name == 'qr'}" th:href="'/view/'+${a.getQr()}" th:text="${p.renderValue(a)}"></a>
-                <span th:if="${p.name != 'qr'}" th:text="${p.renderValue(a)}"></span>
+                <a th:if="${p.name == 'build' && a.getAsset().getBuild() != null}" th:href="'/build/'+${a.getAsset().getBuild().getId()}" th:text="${p.renderValue(a)}"></a>
+                <span th:if="${p.name != 'qr' && (p.name != 'build' || a.getAsset().getBuild() == null)}" th:text="${p.renderValue(a)}"></span>
             </td>
             <td>
                 <a th:href="'/view/'+${a.getQr()}">View</a>