Adding django filters

.pre-commit-config.yaml

@@ -45,6 +45,7 @@ repos:
           - types-django-import-export
           - django-multiselectfield
           - django-tables2
+          - django-filter
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.50.0
     hooks:

dev-requirements.txt

@@ -1,11 +1,13 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.14
 # by the following command:
 #
-#    pip-compile --extra=dev --output-file=dev-requirements.txt
+#    pip-compile --extra=dev --no-index --output-file=dev-requirements.txt
 #
 asgiref==3.13.0
     # via django
+ast-serialize==0.13.1
+    # via mypy
 beautifulsoup4==4.15.0
     # via direct_webapp (pyproject.toml)
 build==1.6.1
@@ -20,8 +22,6 @@ click==8.5.0
     # via
     #   djlint
     #   pip-tools
-colorama==0.4.6
-    # via djlint
 confusable-homoglyphs==3.3.1
     # via django-registration
 coverage[toml]==7.17.0
@@ -40,6 +40,7 @@ django==6.1.2
     #   direct_webapp (pyproject.toml)
     #   django-bootstrap5
     #   django-crispy-forms
+    #   django-filter
     #   django-import-export
     #   django-multiselectfield
     #   django-registration
@@ -52,6 +53,8 @@ django-crispy-forms==2.7
     # via
     #   crispy-bootstrap5
     #   direct_webapp (pyproject.toml)
+django-filter==26.2
+    # via direct_webapp (pyproject.toml)
 django-import-export==4.4.4
     # via direct_webapp (pyproject.toml)
 django-multiselectfield==1.0.1
@@ -109,8 +112,8 @@ nodeenv==1.11.0
 packaging==26.3
     # via
     #   build
-    #   gunicorn
     #   pytest
+    #   virtualenv
     #   wheel
 pathspec==1.1.1
     # via
@@ -119,9 +122,7 @@ pathspec==1.1.1
 pip-tools==7.6.2
     # via direct_webapp (pyproject.toml)
 platformdirs==4.14.0
-    # via
-    #   python-discovery
-    #   virtualenv
+    # via virtualenv
 pluggy==1.7.0
     # via
     #   pytest
@@ -158,18 +159,12 @@ requests==2.34.2
     # via direct_webapp (pyproject.toml)
 ruff==0.17.3
     # via direct_webapp (pyproject.toml)
-six==1.17.0
-    # via
-    #   cssbeautifier
-    #   jsbeautifier
 soupsieve==3.0.4
     # via beautifulsoup4
 sqlparse==0.6.0
     # via django
 tablib==3.10.0
     # via django-import-export
-tqdm==4.70.1
-    # via djlint
 types-django-import-export==4.4.0.20260813
     # via direct_webapp (pyproject.toml)
 types-markdown==3.11.2.20261029

direct_webapp/settings/settings.py

@@ -128,6 +128,7 @@
     "crispy_bootstrap5",
     "import_export",
     "django_tables2",
+    "django_filters",
 ]
 MIDDLEWARE.insert(1, "whitenoise.middleware.WhiteNoiseMiddleware")
 STATIC_ROOT = BASE_DIR / "staticfiles"

doc-requirements.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.14
 # by the following command:
 #
-#    pip-compile --extra=doc --output-file=doc-requirements.txt
+#    pip-compile --extra=doc --no-index --output-file=doc-requirements.txt
 #
 asgiref==3.13.0
     # via django
@@ -32,6 +32,7 @@ django==6.1.2
     #   direct_webapp (pyproject.toml)
     #   django-bootstrap5
     #   django-crispy-forms
+    #   django-filter
     #   django-import-export
     #   django-multiselectfield
     #   django-registration
@@ -43,6 +44,8 @@ django-crispy-forms==2.7
     # via
     #   crispy-bootstrap5
     #   direct_webapp (pyproject.toml)
+django-filter==26.2
+    # via direct_webapp (pyproject.toml)
 django-import-export==4.4.4
     # via direct_webapp (pyproject.toml)
 django-multiselectfield==1.0.1
@@ -124,7 +127,6 @@ nh3==0.3.7
     # via direct_webapp (pyproject.toml)
 packaging==26.3
     # via
-    #   gunicorn
     #   mkdocs
     #   properdocs
 paginate==0.5.7
@@ -173,6 +175,8 @@ tablib==3.10.0
     # via django-import-export
 typing-extensions==4.16.0
     # via django-stubs-ext
+tzdata==2026.6
+    # via python-dateutil
 urllib3==2.8.0
     # via requests
 watchdog==6.0.0

main/filters.py

@@ -0,0 +1,43 @@
+"""Filters for browsing learning resources."""
+
+from django import forms
+from django.db.models import Q, QuerySet
+from django_filters import CharFilter, FilterSet
+
+from .models import LearningResource
+
+
+class LearningResourceFilter(FilterSet):
+    """Search learning resources through a single cross-field search box."""
+
+    q = CharFilter(
+        method="filter_search",
+        label="Search learning resources",
+        widget=forms.SearchInput(
+            attrs={
+                "id": "resource-filter",
+                "placeholder": "Filter learning resources",
+            }
+        ),
+    )
+
+    class Meta:
+        """Limit filtering to the explicitly supported query parameters."""
+
+        model = LearningResource
+        fields = ("q",)
+
+    def filter_search(
+        self,
+        queryset: QuerySet[LearningResource],
+        name: str,
+        value: str,
+    ) -> QuerySet[LearningResource]:
+        """Search resource details and related names without duplicate rows."""
+        return queryset.filter(
+            Q(name__icontains=value)
+            | Q(description__icontains=value)
+            | Q(language__icontains=value)
+            | Q(provider__name__icontains=value)
+            | Q(skill__name__icontains=value)
+        ).distinct()

main/templates/main/pages/learning-resources.html

@@ -1,5 +1,6 @@
 {% extends "main/base.page.html" %}
 {% load static %}
+{% load crispy_forms_tags %}
 {% load render_table from django_tables2 %}
 {% block title %}
     Learning Resources
@@ -16,17 +17,14 @@
             <div class="col pe-lg-4 pe-xl-0">
                 <h1 class="pb-2 pb-lg-3">Learning resources</h1>
                 <form method="get" class="d-flex justify-content-end mb-4">
-                    <div class="input-group w-auto">
-                        <label for="resource-filter"
-                               class="visually-hidden">Search learning resources</label>
-                        <input id="resource-filter"
-                               name="q"
-                               type="search"
-                               value="{{ query }}"
-                               class="form-control"
-                               size="25"
-                               placeholder="Filter learning resources">
+                    {{ filter.form.q|as_crispy_field }}
+                    {% if table.order_by %}
+                        <input type="hidden" name="sort" value="{{ table.order_by }}">
+                    {% endif %}
+                    <div class="d-flex gap-2 justify-content-end">
                         <button type="submit" class="btn btn-primary">Search</button>
+                        <a href="{% url 'learning_resources' %}"
+                           class="btn btn-outline-secondary">Reset</a>
                     </div>
                 </form>
                 {% if table.rows %}

main/views/page_views.py

@@ -18,8 +18,10 @@
 from django.views.decorators.cache import cache_page
 from django.views.generic import DetailView
 from django.views.generic.base import TemplateView
-from django_tables2 import RequestConfig, SingleTableView
+from django_filters.views import FilterView
+from django_tables2 import RequestConfig, SingleTableMixin, SingleTableView
 
+from ..filters import LearningResourceFilter
 from ..models import (
     CompetencyDomain,
     Event,
@@ -174,38 +176,21 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         return context
 
 
-class LearningResourcesPageView(SingleTableView):
+class LearningResourcesPageView(SingleTableMixin, FilterView):
     """View that renders a page with all learning resources.
 
     Learning resources are listed in a table that is searchable and paginated.
     """
 
     model = LearningResource
     table_class = LearningResourceTable
+    filterset_class = LearningResourceFilter
     template_name = "main/pages/learning-resources.html"
     paginate_by = 20
 
     def get_queryset(self) -> QuerySet[LearningResource]:
         """Return learning resources filtered by the optional search query."""
-        queryset = LearningResource.objects.select_related("provider").order_by("name")
-        query = self.request.GET.get("q", "").strip()
-
-        if query:
-            queryset = queryset.filter(
-                Q(name__icontains=query)
-                | Q(description__icontains=query)
-                | Q(language__icontains=query)
-                | Q(provider__name__icontains=query)
-                | Q(skill__name__icontains=query)
-            ).distinct()
-
-        return queryset
-
-    def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
-        """Add the current search query to the template context."""
-        context = super().get_context_data(**kwargs)
-        context["query"] = self.request.GET.get("q", "").strip()
-        return context
+        return LearningResource.objects.select_related("provider").order_by("name")
 
 
 class ToolsLanguagesMethodologiesPageView(SingleTableView):

prod-requirements.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.14
 # by the following command:
 #
-#    pip-compile --extra=prod --output-file=prod-requirements.txt
+#    pip-compile --extra=prod --no-index --output-file=prod-requirements.txt
 #
 asgiref==3.13.0
     # via django
@@ -22,6 +22,7 @@ django==6.1.2
     #   direct_webapp (pyproject.toml)
     #   django-bootstrap5
     #   django-crispy-forms
+    #   django-filter
     #   django-import-export
     #   django-multiselectfield
     #   django-registration
@@ -33,6 +34,8 @@ django-crispy-forms==2.7
     # via
     #   crispy-bootstrap5
     #   direct_webapp (pyproject.toml)
+django-filter==26.2
+    # via direct_webapp (pyproject.toml)
 django-import-export==4.4.4
     # via direct_webapp (pyproject.toml)
 django-multiselectfield==1.0.1
@@ -53,8 +56,6 @@ mysqlclient==2.3.0
     # via direct_webapp (pyproject.toml)
 nh3==0.3.7
     # via direct_webapp (pyproject.toml)
-packaging==26.3
-    # via gunicorn
 requests==2.34.2
     # via direct_webapp (pyproject.toml)
 sqlparse==0.6.0

pyproject.toml

@@ -20,7 +20,9 @@ dependencies = [
     "django-tables2",
     "markdown",
     "nh3",
-    "requests"
+    "requests",
+    "django-filter"
+
 ]
 
 [project.optional-dependencies]
@@ -94,6 +96,10 @@ follow_untyped_imports = true
 module = ["django_tables2.*"]
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = ["django_filters.*"]
+ignore_missing_imports = true
+
 [[tool.mypy.overrides]]
 module = ["main.io_resources"]
 disallow_any_generics = false

requirements.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.14
 # by the following command:
 #
-#    pip-compile
+#    pip-compile --no-index
 #
 asgiref==3.13.0
     # via django
@@ -22,6 +22,7 @@ django==6.1.2
     #   direct_webapp (pyproject.toml)
     #   django-bootstrap5
     #   django-crispy-forms
+    #   django-filter
     #   django-import-export
     #   django-multiselectfield
     #   django-registration
@@ -33,6 +34,8 @@ django-crispy-forms==2.7
     # via
     #   crispy-bootstrap5
     #   direct_webapp (pyproject.toml)
+django-filter==26.2
+    # via direct_webapp (pyproject.toml)
 django-import-export==4.4.4
     # via direct_webapp (pyproject.toml)
 django-multiselectfield==1.0.1
@@ -51,8 +54,6 @@ markdown==3.11.2
     # via direct_webapp (pyproject.toml)
 nh3==0.3.7
     # via direct_webapp (pyproject.toml)
-packaging==26.3
-    # via gunicorn
 requests==2.34.2
     # via direct_webapp (pyproject.toml)
 sqlparse==0.6.0