Merge branch 'master' of github.com:opengisch/QFieldCloud into release

Author: gounux

.github/workflows/build_and_push.yml

@@ -45,6 +45,12 @@ jobs:
             docker_context: docker-nginx
             enable_dockerhub: true
 
+          -
+            service_name: createbuckets
+            dockerfile: docker-createbuckets/Dockerfile
+            docker_context: docker-createbuckets
+            enable_dockerhub: true
+
     steps:
       -
         name: Checkout
@@ -67,8 +73,8 @@ jobs:
           tags: |
             type=ref,enable=true,priority=600,prefix=pr-,suffix=,event=pr
             type=sha,format=short,prefix=commit-,event=pr
-            type=semver,pattern={{version}},event=release
-            type=edge,branch=main
+            type=match,pattern=v(.*),group=1
+            type=edge,branch=master
 
       -
         name: Login to GitHub Container Repository (ghcr.io)

docker-app/qfieldcloud/core/models.py

@@ -1249,14 +1249,12 @@ def thumbnail_url(self) -> str:
         Todo:
             * Delete with QF-4963 Drop support for legacy storage
         """
-        if (
-            # legacy storage
-            self.uses_legacy_storage
-            and not self.legacy_thumbnail_uri
-            # new storage
-            or not self.thumbnail
-        ):
-            return ""
+        if self.uses_legacy_storage:
+            if not self.legacy_thumbnail_uri:
+                return ""
+        else:
+            if not self.thumbnail:
+                return ""
 
         return reverse_lazy(
             "filestorage_project_thumbnails",

docker-app/qfieldcloud/core/staticfiles/css/sso.css

@@ -0,0 +1,23 @@
+/* SSO providers buttons */
+.provider-button-parent {
+    list-style: none;
+    margin: 0 1em 1em 0;
+    padding: 0;
+  }
+
+  .provider-button {
+    border-radius: .25rem;
+    padding: .5rem;
+  }
+
+  .provider-button img {
+    margin-right: 1em;
+    width: 50px;
+    height: 50px;
+  }
+
+  .provider-button span {
+    font-size: larger;
+    margin-bottom: 0;
+  }
+  /* /SSO providers buttons */

docker-app/qfieldcloud/core/templates/allauth/elements/provider.html

@@ -0,0 +1,13 @@
+<li class="provider-button-parent">
+
+    <a title="{{ attrs.name }}" href="{{ attrs.href }}">
+        <div class="provider-button" style="border: 1px solid {{ attrs.styles.light.color_stroke|default:"grey" }}; background-color: {{ attrs.styles.light.color_fill|default:"white" }}">
+
+            <img src="{{ attrs.styles.light.logo }}" alt="{{ attrs.name }}">
+            <span>
+                <strong style="color: {{ attrs.styles.light.color_text|default:"black" }}">{{ attrs.name }}</strong>
+            </span>
+
+        </div>
+    </a>
+</li>

docker-app/qfieldcloud/core/templates/socialaccount/snippets/provider_list.html

@@ -1,5 +1,9 @@
 {% load allauth socialaccount %}
 {% get_providers as socialaccount_providers %}
+
+{% load static %}
+<link rel="stylesheet" type="text/css" href="{% static 'css/sso.css' %}">
+
 {% if socialaccount_providers %}
     {% element provider_list %}
         {% for provider in socialaccount_providers %}

docker-app/qfieldcloud/core/views/package_views.py

@@ -355,6 +355,7 @@ def get(self, request, project_id, filename):
             project_id,
             filename,
             file_type=file_type,
+            package_job_id=project.last_package_job_id,
         )
 
 

docker-app/qfieldcloud/filestorage/models.py

@@ -49,7 +49,7 @@ class FileType(models.IntegerChoices):
         related_name="files",
     )
 
-    package_job_id: int
+    package_job_id: UUID
     package_job = models.ForeignKey(
         Job,
         on_delete=models.DO_NOTHING,

docker-app/qfieldcloud/filestorage/view_helpers.py

@@ -5,6 +5,7 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
 from django.db import transaction
+from django.db.models import Q
 from django.db.models.fields.files import FieldFile
 from django.http import FileResponse, HttpResponse
 from django.http.response import HttpResponseBase
@@ -162,23 +163,45 @@ def download_project_file_version(
     filename: str,
     file_type: File.FileType,
     as_attachment: bool = True,
+    package_job_id: UUID | None = None,
 ) -> HttpResponseBase:
     version_id = request.GET.get("version")
 
+    if file_type == File.FileType.PACKAGE_FILE and not package_job_id:
+        raise Exception(
+            f"When downloading a package file the `package_job_id` should be non-empty, but got {package_job_id=}."
+        )
+
     if version_id:
-        file_version = FileVersion.objects.get(
+        filters = Q(
             id=version_id,
             file__project_id=project_id,
             file__name=filename,
             file__file_type=file_type,
         )
+
+        if package_job_id:
+            filters &= Q(
+                Q(file__package_job_id=package_job_id)
+                | Q(file__file_type=File.FileType.PROJECT_FILE)
+            )
+
+        file_version = FileVersion.objects.get(filters)
     else:
-        file = File.objects.select_related("latest_version").get(
+        filters = Q(
             project_id=project_id,
             name=filename,
             file_type=file_type,
         )
 
+        if package_job_id:
+            filters &= Q(
+                Q(package_job_id=package_job_id)
+                | Q(file_type=File.FileType.PROJECT_FILE)
+            )
+
+        file = File.objects.select_related("latest_version").get(filters)
+
         assert file.latest_version
 
         file_version = file.latest_version