Merge branch 'master' into release

Author: gounux

.env.example

@@ -140,11 +140,23 @@ STORAGES='{
         }
     }'
 
-# Setting what is the default storage. If empty, it will use the `default` storage.
+# Setting what is the default storage for new projects. If empty, it will use the `default` storage.
 # NOTE: The value must be a key of the `STORAGES` setting.
 # DEFAULT: ""
 # STORAGES_PROJECT_DEFAULT_STORAGE=
 
+# Setting what is the default attachments storage for new projects. If empty, it will use the `default` storage.
+# NOTE: The value must be a key of the `STORAGES` setting.
+# DEFAULT: ""
+# STORAGES_PROJECT_DEFAULT_ATTACHMENTS_STORAGE=
+
+# Default value on new projects if attachments should be versioned.
+# NOTE: can currently be unset only when using an attachment storage of type WebDAV (qfieldcloud.filestorage.backend.QfcWebDavStorage).
+# See definition of the `STORAGES_PROJECT_DEFAULT_ATTACHMENTS_STORAGE` setting.
+# VALUES: 0 - not versioned; 1 - versioned
+# DEFAULT: 1
+# STORAGE_PROJECT_DEFAULT_ATTACHMENTS_VERSIONED=1
+
 
 ##################
 # Nginx settings

.flake8

@@ -2,4 +2,4 @@
 exclude =
     .git,
     __pycache__
-select = CLB100
+select = CLB100, IF100

.pre-commit-config.yaml

@@ -34,7 +34,7 @@ repos:
     rev: '7.3.0'
     hooks:
     -   id: flake8
-        additional_dependencies: [flake8-clean-block]
+        additional_dependencies: [flake8-clean-block, flake8-if-expr]
 
   # Lint and format
   - repo: https://github.com/astral-sh/ruff-pre-commit

docker-app/Dockerfile

@@ -17,7 +17,6 @@ RUN apt-get update \
     libpq-dev \
     python3-dev \
     gcc \
-    git \
     && rm -rf /var/lib/apt/lists/*
 
 # install `pip-compile` (as part of `pip-tools`)

docker-app/qfieldcloud/core/adapters.py

@@ -1,5 +1,6 @@
 import logging
 import traceback
+from datetime import timedelta
 from random import randint
 from typing import Literal
 
@@ -8,9 +9,12 @@
 from allauth.account.models import EmailConfirmationHMAC
 from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
+from constance import config
+from django.contrib import messages
 from django.contrib.auth.models import AbstractUser
 from django.core.exceptions import ValidationError
 from django.http import HttpRequest
+from django.utils import timezone
 from invitations.adapters import BaseInvitationsAdapter
 
 from qfieldcloud.authentication.sso.provider_styles import SSOProviderStyles
@@ -27,6 +31,26 @@ class AccountAdapter(DefaultAccountAdapter, BaseInvitationsAdapter):
     to overcome this limitation by providing custom `new_user` method.
     """
 
+    def login(self, request, user):
+        # last_login here is the *previous* login time
+        previous_last_login = user.last_login
+
+        response = super().login(request, user)
+
+        threshold = getattr(config, "WEB_USER_INACTIVITY_THRESHOLD_DAYS", 0)
+
+        if previous_last_login and threshold > 0:
+            delta = timezone.now() - previous_last_login
+            if delta > timedelta(days=threshold):
+                messages.add_message(
+                    request,
+                    messages.INFO,
+                    "You have been inactive for a while, welcome back!",
+                    extra_tags="inactive-user-modal",
+                )
+
+        return response
+
     def new_user(self, request):
         """
         Instantiates a new User instance.

docker-app/qfieldcloud/core/admin.py

@@ -49,6 +49,7 @@
 
 from qfieldcloud.core import exceptions
 from qfieldcloud.core.models import (
+    SHARED_DATASETS_PROJECT_NAME,
     ApplyJob,
     ApplyJobDelta,
     Delta,
@@ -71,6 +72,7 @@
 from qfieldcloud.core.utils2 import delta_utils, jobs, pg_service_file
 from qfieldcloud.filestorage.backend import QfcS3Boto3Storage
 from qfieldcloud.filestorage.models import File
+from qfieldcloud.subscription.models import get_subscription_model
 
 
 class QfcAdminSite(AdminSite):
@@ -147,8 +149,37 @@ class ModelAdminEstimateCountMixin:
     list_per_page = settings.QFIELDCLOUD_ADMIN_LIST_PER_PAGE
 
 
+class ModelAdminSearchParserMixin:
+    """
+    Mixin to add search parser to the model admin.
+    """
+
+    search_parser_config: dict[str, dict[str, Any]] | None = None
+
+    def get_search_results(
+        self, request: HttpRequest, queryset: QuerySet, search_term: str
+    ) -> tuple[QuerySet, bool]:
+        if self.search_parser_config:
+            filters = search_parser(
+                request,
+                queryset,
+                search_term,
+                self.search_parser_config,
+            )
+
+            if filters:
+                # Bypass standard search to avoid literal matching,
+                # Return True to enable distinct to handle potential duplicates.
+                return queryset.filter(**filters), True
+
+        return super().get_search_results(request, queryset, search_term)  # type: ignore
+
+
 class QFieldCloudModelAdmin(  # type: ignore
-    ModelAdminNoPkOrderChangeListMixin, ModelAdminEstimateCountMixin, admin.ModelAdmin
+    ModelAdminNoPkOrderChangeListMixin,
+    ModelAdminEstimateCountMixin,
+    ModelAdminSearchParserMixin,
+    admin.ModelAdmin,
 ):
     def has_delete_permission(self, request, obj=None):
         """Reimplementing this Django Admin method to allow deleting related objects in django admin from another ModelAdmin.
@@ -565,6 +596,26 @@ def save_model(self, request, obj, form, change):
         obj.clean()
         obj.save()
 
+    def change_view(
+        self,
+        request: HttpRequest,
+        object_id: str,
+        form_url: str = "",
+        extra_context: Any | None = None,
+    ) -> HttpResponse:
+        # Add the subscription model is editable flag to the extra context
+        extra_context = extra_context or {}
+
+        extra_context.update(
+            {
+                "subscription_model": get_subscription_model(),
+            }
+        )
+
+        return super().change_view(
+            request, object_id, form_url, extra_context=extra_context
+        )
+
     def get_urls(self):
         urls = super().get_urls()
 
@@ -884,6 +935,26 @@ def clean_are_attachments_versioned(self):
 
         return value
 
+    def clean(self):
+        cleaned_data = super().clean()
+        name = cleaned_data.get("name")
+
+        if name and name.lower() == SHARED_DATASETS_PROJECT_NAME:
+            if (
+                self.instance.pk
+                and self.instance.name.lower() == SHARED_DATASETS_PROJECT_NAME
+            ):
+                pass
+
+            elif self.instance.has_the_qgis_file:
+                raise ValidationError(
+                    _(
+                        "Cannot rename project to '{}' because it contains a QGIS project file."
+                    ).format(name)
+                )
+
+        return cleaned_data
+
 
 class ProjectAdmin(QFieldCloudModelAdmin):
     form = ProjectForm
@@ -960,6 +1031,18 @@ class ProjectAdmin(QFieldCloudModelAdmin):
 
     change_form_template = "admin/project_change_form.html"
 
+    search_parser_config = {
+        "owner": {
+            "filter": "owner__username__iexact",
+        },
+        "collaborator": {
+            "filter": "user_roles__user__username__iexact",
+            "extra_filters": {
+                "is_public": False,
+            },
+        },
+    }
+
     def get_form(self, *args, **kwargs):
         help_texts = {
             "file_storage_bytes": _(
@@ -969,33 +1052,6 @@ def get_form(self, *args, **kwargs):
         kwargs.update({"help_texts": help_texts})
         return super().get_form(*args, **kwargs)
 
-    def get_search_results(self, request, queryset, search_term):
-        filters = search_parser(
-            request,
-            queryset,
-            search_term,
-            {
-                "owner": {
-                    "filter": "owner__username__iexact",
-                },
-                "collaborator": {
-                    "filter": "user_roles__user__username__iexact",
-                    "extra_filters": {
-                        "is_public": False,
-                    },
-                },
-            },
-        )
-
-        if filters:
-            return queryset.filter(**filters), True
-
-        queryset, use_distinct = super().get_search_results(
-            request, queryset, search_term
-        )
-
-        return queryset, use_distinct
-
     def project_files(self, instance):
         return instance.pk
 
@@ -1107,6 +1163,12 @@ class JobAdmin(QFieldCloudModelAdmin):
 
     change_form_template = "admin/job_change_form.html"
 
+    search_parser_config = {
+        "created_by": {
+            "filter": "created_by__username__iexact",
+        },
+    }
+
     def get_queryset(self, request):
         return super().get_queryset(request).defer("output", "feedback")
 
@@ -1325,6 +1387,12 @@ class DeltaAdmin(QFieldCloudModelAdmin):
 
     change_form_template = "admin/delta_change_form.html"
 
+    search_parser_config = {
+        "created_by": {
+            "filter": "created_by__username__iexact",
+        },
+    }
+
     def old_geom_truncated(self, instance):
         return self.geom_truncated(instance.old_geom)
 
@@ -1333,7 +1401,10 @@ def new_geom_truncated(self, instance):
 
     # Show geometries only truncated as they are fully shown in content
     def geom_truncated(self, geom):
-        return f"{str(geom)[:70]} ..." if geom else "-"
+        if geom:
+            return f"{str(geom)[:70]} ..."
+        else:
+            return "-"
 
     # This will disable add functionality
 
@@ -1487,6 +1558,15 @@ class OrganizationAdmin(QFieldCloudModelAdmin):
 
     autocomplete_fields = ("organization_owner",)
 
+    search_parser_config = {
+        "owner": {
+            "filter": "organization_owner__username__iexact",
+        },
+        "member": {
+            "filter": "membership_roles__user__username__iexact",
+        },
+    }
+
     @admin.display(description=_("Active members"))
     def active_users_links(self, instance) -> str:
         persons = instance.useraccount.current_subscription.active_users
@@ -1516,30 +1596,6 @@ def storage_usage__field(self, instance) -> str:
         used_storage_perc = instance.useraccount.storage_used_ratio * 100
         return f"{used_storage} {free_storage} ({used_storage_perc:.2f}%)"
 
-    def get_search_results(self, request, queryset, search_term):
-        filters = search_parser(
-            request,
-            queryset,
-            search_term,
-            {
-                "owner": {
-                    "filter": "organization_owner__username__iexact",
-                },
-                "member": {
-                    "filter": "membership_roles__user__username__iexact",
-                },
-            },
-        )
-
-        if filters:
-            return queryset.filter(**filters), True
-
-        queryset, use_distinct = super().get_search_results(
-            request, queryset, search_term
-        )
-
-        return queryset, use_distinct
-
     def save_formset(self, request, form, formset, change):
         for form_obj in formset:
             if isinstance(form_obj.instance, OrganizationMember):
@@ -1644,10 +1700,19 @@ def lookups(self, request, model_admin):
 
 
 class LogEntryAdmin(
-    ModelAdminNoPkOrderChangeListMixin, ModelAdminEstimateCountMixin, BaseLogEntryAdmin
+    ModelAdminNoPkOrderChangeListMixin,
+    ModelAdminEstimateCountMixin,
+    ModelAdminSearchParserMixin,
+    BaseLogEntryAdmin,
 ):
     list_filter = ("action", QFieldCloudResourceTypeFilter)
 
+    search_parser_config = {
+        "user": {
+            "filter": "actor__username__iexact",
+        },
+    }
+
 
 class FaultyDeltaFilesAdmin(QFieldCloudModelAdmin):
     list_display = (
@@ -1681,6 +1746,12 @@ class FaultyDeltaFilesAdmin(QFieldCloudModelAdmin):
 
     exclude = ("traceback",)
 
+    search_parser_config = {
+        "owner": {
+            "filter": "project__owner__username__iexact",
+        },
+    }
+
     def traceback__pre(self, instance) -> str:
         return format_pre(instance.traceback)
 

docker-app/qfieldcloud/core/exceptions.py

@@ -200,3 +200,12 @@ class InvalidRangeError(QFieldCloudException):
     code = "invalid_http_range"
     message = "The provided HTTP range header is invalid."
     status_code = status.HTTP_416_REQUESTED_RANGE_NOT_SATISFIABLE
+
+
+class QGISProjectFileNotAllowedError(QFieldCloudException):
+    """Raised when a QGIS project file is uploaded to a project that does not allow it
+    (e.g. shared datasets project)"""
+
+    code = "qgis_project_file_not_allowed"
+    message = "QGIS project files are not allowed in this project."
+    status_code = status.HTTP_400_BAD_REQUEST