Merge branch 'main' into themes

* main:
  Update Django to 4.2.3 and also update other python packages. (#4582)
  Handle rare event of file uploads having data without id (#4581)
  Create a json output version of the open calls on the front page. (#4554)
  Correct project template urls. (#4575)
  Fix submission filters queryset issue (#4572)

Author: theskumar

docs/references/open-calls-api-json.md

@@ -0,0 +1,17 @@
+# Open calls API endpoint
+
+At `/api/v2/open-calls.json` that same lists and order of open calls that appear on the front page are available in JSON format.
+
+```json
+[
+    {
+        "description": "The application description if any.",
+        "image": "/path/to/application/image.jpeg",
+        "next_deadline": "1970-01-01",
+        "title": "Title of the application",
+        "weight": 1
+    }
+]
+```
+
+This should make it easy to add a list of open calls to the organisations main web site.

hypha/api/__init__.py

@@ -0,0 +1,9 @@
+from django.urls import include, path
+
+from .v2 import urls as v2_urls
+
+app_name = "api"
+
+urlpatterns = [
+    path("v2/", include(v2_urls)),
+]

hypha/api/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+
+from .views import open_calls_json
+
+app_name = "v2"
+
+urlpatterns = [
+    path("open-calls.json", open_calls_json),
+]

hypha/api/v2/__init__.py

@@ -0,0 +1,24 @@
+from django.conf import settings
+from django.http import JsonResponse
+from django_ratelimit.decorators import ratelimit
+
+from hypha.apply.funds.models import ApplicationBase, LabBase
+
+
+@ratelimit(key="ip", rate=settings.DEFAULT_RATE_LIMIT)
+def open_calls_json(request):
+    """Open calls in JSON format.
+
+    List open calls in JSON format, useful when you want to list open calls on an external site.
+    """
+    rounds = ApplicationBase.objects.order_by_end_date().specific()
+    labs = LabBase.objects.public().live().specific()
+    all_funds = list(rounds) + list(labs)
+
+    # Only pass rounds/labs that are open & visible for the front page
+    data = [
+        fund.as_json
+        for fund in all_funds
+        if fund.open_round and fund.list_on_front_page
+    ]
+    return JsonResponse(data, safe=False)

hypha/api/v2/urls.py

@@ -1,6 +1,7 @@
 from datetime import date
 from typing import Optional
 
+import nh3
 from django import forms
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
@@ -73,10 +74,40 @@ def order_by_end_date(self):
         return qs.order_by("end_date")
 
 
+class AsJsonMixin:
+    @cached_property
+    def as_json(self):
+        # Clean the strings in title and description.
+        title = nh3.clean(self.title, tags=set())
+        description = nh3.clean(self.description, tags=set())
+        # If image exist scale it down and convert to webp.
+        image = (
+            self.image.get_rendition("max-1200x1200|format-webp|webpquality-60").url
+            if self.image
+            else ""
+        )
+        # Make sure weight is an int.
+        weight = int(self.weight)
+        # If next deadline exist and is set to show, format it as standard iso date.
+        try:
+            next_deadline = (
+                self.next_deadline().isoformat() if self.show_deadline else ""
+            )
+        except AttributeError:
+            next_deadline = ""
+        return {
+            "title": title,
+            "description": description,
+            "image": image,
+            "weight": weight,
+            "next_deadline": next_deadline,
+        }
+
+
 @method_decorator(
     ratelimit(key="ip", rate=settings.DEFAULT_RATE_LIMIT, method="POST"), name="serve"
 )
-class ApplicationBase(EmailForm, WorkflowStreamForm):  # type: ignore
+class ApplicationBase(EmailForm, WorkflowStreamForm, AsJsonMixin):  # type: ignore
     is_creatable = False
 
     # Adds validation around forms & workflows. Isn't on Workflow class due to not displaying workflow field on Round
@@ -555,7 +586,7 @@ def serve(self, request, *args, **kwargs):
 @method_decorator(
     ratelimit(key="ip", rate=settings.DEFAULT_RATE_LIMIT, method="POST"), name="serve"
 )
-class LabBase(EmailForm, WorkflowStreamForm, SubmittableStreamForm):  # type: ignore
+class LabBase(EmailForm, WorkflowStreamForm, SubmittableStreamForm, AsJsonMixin):  # type: ignore
     is_creatable = False
     submission_class = ApplicationSubmission
 

hypha/api/v2/views.py

@@ -110,7 +110,7 @@ def process_file_data(self, data, latest_existing_data=None):
                 new_file_upload = False
                 for file_data in uploads_data:
                     # id can be a path or a uuid, where path can exist only for existing files so uuid means a new file
-                    if self._is_valid_uuid(file_data["id"]):
+                    if self._is_valid_uuid(file_data.get("id", None)):
                         new_file_upload = True  # if any new file is uploaded we have to process and save the files
 
                 # get existing files from instance
@@ -153,7 +153,7 @@ def _is_valid_uuid(self, value):
         try:
             uuid.UUID(value)
             return True
-        except ValueError:
+        except (ValueError, TypeError):
             return False
 
     def extract_files(self):

hypha/apply/funds/models/applications.py

@@ -235,32 +235,15 @@ def get_used_rounds(request):
     return Round.objects.filter(submissions__isnull=False).distinct()
 
 
-def get_used_rounds_from_dataset(dataset):
-    return Round.objects.filter(id__in=dataset.values("round")).distinct()
-
-
 def get_used_funds(request):
     # Use page to pick up on both Labs and Funds
     return Page.objects.filter(applicationsubmission__isnull=False).distinct()
 
 
-def get_used_funds_from_dataset(dataset):
-    return Page.objects.filter(id__in=dataset.values("page")).distinct()
-
-
 def get_round_leads(request):
     return User.objects.filter(submission_lead__isnull=False).distinct()
 
 
-def get_round_leads_from_dataset(dataset):
-    return User.objects.filter(id__in=dataset.values("lead")).distinct()
-
-
-def get_reviewers_from_dataset(dataset):
-    """All assigned reviewers, not including Staff and Admin because we want a list of reviewers only"""
-    return User.objects.filter(id__in=dataset.values("reviewers")).distinct()
-
-
 def get_screening_statuses(request):
     return ScreeningStatus.objects.filter(
         id__in=ApplicationSubmission.objects.all()
@@ -269,12 +252,6 @@ def get_screening_statuses(request):
     )
 
 
-def get_screening_statuses_from_dataset(dataset):
-    return ScreeningStatus.objects.filter(
-        id__in=dataset.values("screening_statuses__id")
-    ).distinct()
-
-
 def get_meta_terms(request):
     return MetaTerm.objects.filter(
         filter_on_dashboard=True,
@@ -284,12 +261,6 @@ def get_meta_terms(request):
     )
 
 
-def get_meta_terms_from_dataset(dataset):
-    return MetaTerm.objects.filter(
-        filter_on_dashboard=True, id__in=dataset.values("meta_terms__id")
-    ).distinct()
-
-
 class MultiCheckboxesMixin(filters.Filter):
     def __init__(self, *args, **kwargs):
         label = kwargs.get("label")
@@ -359,32 +330,8 @@ def __init__(self, *args, exclude=None, limit_statuses=None, **kwargs):
         if exclude is None:
             exclude = []
 
-        qs = kwargs.get("queryset")
-
-        archived = kwargs.pop("archived") if "archived" in kwargs.keys() else None
-        if archived is not None:
-            archived = int(archived) if archived else None
-
         super().__init__(*args, **kwargs)
 
-        reviewers_qs = get_reviewers_from_dataset(
-            dataset=qs.exclude(reviewers__isnull=True)
-        )
-        if archived is not None and archived == 0:
-            reviewers_qs = get_reviewers_from_dataset(
-                dataset=qs.filter(is_archive=archived).exclude(reviewers__isnull=True)
-            )
-            qs = qs.filter(is_archive=archived)
-
-        self.filters["fund"].queryset = get_used_funds_from_dataset(dataset=qs)
-        self.filters["round"].queryset = get_used_rounds_from_dataset(dataset=qs)
-        self.filters["lead"].queryset = get_round_leads_from_dataset(dataset=qs)
-        self.filters[
-            "screening_statuses"
-        ].queryset = get_screening_statuses_from_dataset(dataset=qs)
-        self.filters["reviewers"].queryset = reviewers_qs
-        self.filters["meta_terms"].queryset = get_meta_terms_from_dataset(dataset=qs)
-
         self.filters["status"] = StatusMultipleChoiceFilter(limit_to=limit_statuses)
         self.filters["category_options"].extra["choices"] = [
             (option.id, option.value)

hypha/apply/funds/models/mixins.py

@@ -31,7 +31,7 @@
                                     {% heroicon_mini "information-circle" class="inline align-middle fill-light-blue" aria_hidden=true %}
                                     <a
                                         class="font-semibold border-b-2 border-dashed"
-                                        href="{% url 'apply:projects:category_template' pk=object.pk type='contract_document' category_pk=document_category.pk %}"
+                                        href="{% url 'apply:projects:category_template' pk=object.submission.pk type='contract_document' category_pk=document_category.pk %}"
                                         target="_blank"
                                     >
                                         {% trans "View template" %}