Merge branch 'eitchtee:main' into main

app/WYGIWYH/settings.py

@@ -222,7 +222,7 @@ SESSION_COOKIE_SECURE = os.getenv("HTTPS_ENABLED", "false").lower() == "true"
 
 DEBUG_TOOLBAR_CONFIG = {
     "ROOT_TAG_EXTRA_ATTRS": "hx-preserve",
-    "SHOW_TOOLBAR_CALLBACK": lambda r: False,  # disables it}
+    # "SHOW_TOOLBAR_CALLBACK": lambda r: False,  # disables it
 }
 DEBUG_TOOLBAR_PANELS = [
     "debug_toolbar.panels.history.HistoryPanel",

app/apps/common/tasks.py

@@ -1,5 +1,8 @@
 import logging
 
+from asgiref.sync import sync_to_async
+from django.core import management
+
 from procrastinate import builtin_tasks
 from procrastinate.contrib.django import app
 
@@ -24,3 +27,16 @@ async def remove_old_jobs(context, timestamp):
             exc_info=True,
         )
         raise e
+
+
+@app.periodic(cron="0 6 1 * *")
+@app.task(queueing_lock="remove_expired_sessions")
+async def remove_expired_sessions(timestamp=None):
+    """Cleanup expired sessions by using Django management command."""
+    try:
+        await sync_to_async(management.call_command)("clearsessions", verbosity=0)
+    except Exception:
+        logger.error(
+            "Error while executing 'remove_expired_sessions' task",
+            exc_info=True,
+        )

app/apps/import_app/schemas/v1.py

@@ -65,7 +65,7 @@ class CSVImportSettings(BaseModel):
 
 
 class ColumnMapping(BaseModel):
-    source: Optional[str] = Field(
+    source: Optional[str] | Optional[list[str]] = Field(
         default=None,
         description="CSV column header. If None, the field will be generated from transformations",
     )

app/apps/import_app/services/v1.py

@@ -486,8 +486,18 @@ class ImportService:
         mapped_data = {}
 
         for field, mapping in self.mapping.items():
-            # If source is None, use None as the initial value
-            value = row.get(mapping.source) if mapping.source else None
+            value = None
+
+            if isinstance(mapping.source, str):
+                value = row.get(mapping.source)
+            elif isinstance(mapping.source, list):
+                for source in mapping.source:
+                    value = row.get(source)
+                    if value is not None:
+                        break
+            else:
+                # If source is None, use None as the initial value
+                value = None
 
             # Use default_value if value is None
             if value is None:

app/apps/monthly_overview/views.py

@@ -30,6 +30,8 @@ def index(request):
 @login_required
 @require_http_methods(["GET"])
 def monthly_overview(request, month: int, year: int):
+    order = request.session.get("monthly_transactions_order", "default")
+
     if month < 1 or month > 12:
         from django.http import Http404
 
@@ -54,6 +56,7 @@ def monthly_overview(request, month: int, year: int):
             "previous_month": previous_month,
             "previous_year": previous_year,
             "filter": f,
+            "order": order,
         },
     )
 
@@ -62,7 +65,12 @@ def monthly_overview(request, month: int, year: int):
 @login_required
 @require_http_methods(["GET"])
 def transactions_list(request, month: int, year: int):
-    order = request.GET.get("order")
+    order = request.session.get("monthly_transactions_order", "default")
+
+    if "order" in request.GET:
+        order = request.GET["order"]
+        if order != request.session.get("monthly_transactions_order", "default"):
+            request.session["monthly_transactions_order"] = order
 
     f = TransactionsFilter(request.GET)
     transactions_filtered = (

app/apps/transactions/views/transactions.py

@@ -313,15 +313,23 @@ def transaction_pay(request, transaction_id):
 @login_required
 @require_http_methods(["GET"])
 def transaction_all_index(request):
+    order = request.session.get("all_transactions_order", "default")
     f = TransactionsFilter(request.GET)
-    return render(request, "transactions/pages/transactions.html", {"filter": f})
+    return render(
+        request, "transactions/pages/transactions.html", {"filter": f, "order": order}
+    )
 
 
 @only_htmx
 @login_required
 @require_http_methods(["GET"])
 def transaction_all_list(request):
-    order = request.GET.get("order")
+    order = request.session.get("all_transactions_order", "default")
+
+    if "order" in request.GET:
+        order = request.GET["order"]
+        if order != request.session.get("all_transactions_order", "default"):
+            request.session["all_transactions_order"] = order
 
     transactions = Transaction.objects.prefetch_related(
         "account",

app/templates/monthly_overview/pages/overview.html

@@ -113,9 +113,9 @@
           <div class="text-sm-end" _="on change trigger updated on window">
             <label for="order">{% translate "Order by" %}</label>
             <select class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded" name="order" id="order">
-              <option value="default">{% translate 'Default' %}</option>
-              <option value="older">{% translate 'Oldest first' %}</option>
-              <option value="newer">{% translate 'Newest first' %}</option>
+              <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+              <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+              <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
             </select>
           </div>
         </div>

app/templates/transactions/pages/transactions.html

@@ -32,9 +32,9 @@
         <div class="tw-content-center" _="on change trigger updated on window">
           <label for="order">{% translate "Order by" %}</label>
           <select class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded" name="order" id="order">
-            <option value="default">{% translate 'Default' %}</option>
-            <option value="older">{% translate 'Oldest first' %}</option>
-            <option value="newer">{% translate 'Newest first' %}</option>
+            <option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
+            <option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
+            <option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
           </select>
         </div>
       </div>