Merge branch 'main' into add-backlink-on-iframes

Author: fabienheureux

.github/workflows/ci.yml

@@ -4,13 +4,12 @@ on:
   workflow_call:
 
 jobs:
-
   backend_linter:
     name: 📝 Backend Linter
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           cache: "pip"
       - name: Install poetry
@@ -40,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: ".tool-versions"
           cache: "npm"
@@ -70,7 +69,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           cache: "pip"
       - name: Install GIS Packages
@@ -103,7 +102,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: ".tool-versions"
           cache: "npm"
@@ -118,9 +117,6 @@ jobs:
     name: tests de bout-en-bout
     runs-on: ubuntu-latest
     if: ${{ github.ref_name == 'main' || (github.event_name ==  'pull_request' && contains( github.event.pull_request.labels.*.name, 'frontend')) }}
-    strategy:
-      matrix:
-        shard: [1/5, 2/5, 3/5, 4/5, 5/5]
     services:
       postgres:
         image: postgis/postgis:15-3.3-alpine
@@ -142,8 +138,9 @@ jobs:
         run: |
           cp .env.template .env
           echo BASE_URL=http://localhost:8000 >> .env
+          echo DEBUG=false >> .env
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version-file: ".tool-versions"
           cache: "npm"
@@ -153,7 +150,7 @@ jobs:
           npm ci
           npm run build
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           cache: "pip"
 
@@ -172,12 +169,11 @@ jobs:
       - name: Install the project dependencies
         run: poetry sync --with dev --no-root
 
-      - name: Migrate database
+      - name: Prepare django, migrate, collect static files...
         run: |
           make createcachetable
           make migrate
-        env:
-          PYTEST_CURRENT_TEST: "ongoing"
+          make collectstatic
 
       - name: Populate database
         run: |
@@ -195,7 +191,14 @@ jobs:
         run: make init-playwright
 
       - name: Run Playwright tests
-        run: npx playwright test --reporter=list --update-snapshots --shard=${{ matrix.shard }}
+        run: npx playwright test --update-snapshots
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30
 
 # Address actions/missing-workflow-permissions rule in
 # code scanning alerts

.github/workflows/publish-docs.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Check out the code
       uses: actions/checkout@v5
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         cache: "pip"
     - name: Install poetry

.github/workflows/review.yml

@@ -5,10 +5,15 @@ on:
   pull_request:
     types: [opened, synchronize]
 
+
 defaults:
   run:
     shell: bash
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ci:
     name: 🤖 CI
@@ -41,4 +46,3 @@ jobs:
 # code scanning alerts
 permissions:
   contents: read
-

.tool-versions

@@ -1,2 +1,2 @@
 python 3.12
-nodejs 20.17.0
+nodejs 20.19.0

Makefile

@@ -10,8 +10,7 @@ DJANGO_ADMIN := $(PYTHON) manage.py
 PYTEST := poetry run pytest
 HONCHO := poetry run honcho
 DB_URL := postgres://webapp:webapp@localhost:6543/webapp# pragma: allowlist secret
-ASSISTANT_URL := quefairedemesdechets.ademe.local
-LVAO_URL := lvao.ademe.local
+BASE_DOMAIN := quefairedemesdechets.ademe.local
 FIXTURES_OPTIONS := --indent 4 --natural-foreign --natural-primary
 
 # Makefile config
@@ -23,7 +22,11 @@ check:
 
 .PHONY: init-certs
 init-certs:
-	docker run -ti -v ./nginx-local-only/certs:/app/certs -w /app/certs --rm alpine/mkcert $(LVAO_URL) $(ASSISTANT_URL)
+	@which mkcert > /dev/null || { echo "mkcert is not installed. Please install it first: brew install mkcert (macOS) or visit https://github.com/FiloSottile/mkcert"; exit 1; }
+	mkcert -install
+	mkcert $(BASE_DOMAIN)
+	mv *.pem ./nginx-local-only/certs/
+	docker compose restart lvao-proxy
 
 .PHONY: init-playwright
 init-playwright:
@@ -46,7 +49,7 @@ init-dev:
 	cp ./dags/.env.template ./dags/.env
 	# prepare django
 	make run-all
-	make create_remote_db_server
+	make create-remote-db-server
 	make migrate
 	make createcachetable
 	make createsuperuser
@@ -78,6 +81,10 @@ run-all:
 migrate:
 	$(DJANGO_ADMIN) migrate
 
+.PHONY: collectstatic
+collectstatic:
+	$(DJANGO_ADMIN) collectstatic --noinput
+
 .PHONY: shell
 shell:
 	$(DJANGO_ADMIN) shell
@@ -99,8 +106,8 @@ createcachetable:
 clearsessions:
 	$(DJANGO_ADMIN) clearsessions
 
-.PHONY: create_remote_db_server
-create_remote_db_server:
+.PHONY: create-remote-db-server
+create-remote-db-server:
 	$(DJANGO_ADMIN) create_remote_db_server
 
 .PHONY: createsuperuser
@@ -158,11 +165,11 @@ dags-test:
 
 .PHONY: e2e-test
 e2e-test:
-	npx playwright test --update-snapshots
+	npx playwright test --update-snapshots all
 
 .PHONY: e2e-test-ui
 e2e-test-ui:
-	npx playwright test --update-snapshots --ui
+	npx playwright test --update-snapshots all --ui
 
 .PHONY: a11y
 a11y:
@@ -209,6 +216,9 @@ dump-production:
 	sh scripts/infrastructure/backup-db.sh
 
 # We need to create extensions because they are not restored by pg_restore
+.PHONY: create-sql-extensions
+create_sql_extensions:
+
 .PHONY: load-production-dump
 load-production-dump:
 	@DUMP_FILE=$$(find tmpbackup -type f -name "*.custom" -print -quit); \
@@ -222,7 +232,7 @@ db-restore:
 	make create-schema-public
 	make load-production-dump
 	make migrate
-	make create_remote_db_server
+	make create-remote-db-server
 
 .PHONY: db-restore-for-tests
 db-restore-for-tests:
@@ -239,4 +249,4 @@ build-docs:
 .PHONY: fmt-infra
 fmt-infra:
 	tofu fmt -recursive infrastructure
-	terragrunt hcl fmt infrastructure
+	terragrunt hcl fmt infrastructure

bin/post_deploy

@@ -1,7 +1,7 @@
 #!/bin/env bash
 
-make createcachetable
-make migrate
-make clearsessions
-make clear-cache
-make create_remote_db_server
+python manage.py createcachetable
+python manage.py migrate
+python manage.py clearsessions
+python manage.py clear_cache --all
+python manage.py create_remote_db_server

core/jinja2_handler.py

@@ -1,13 +1,8 @@
 from math import sqrt
 
 from django.http import HttpRequest
-from django.templatetags.static import static
-from django.urls import reverse
-from django.utils.html import linebreaks
 
-from core.templatetags.share_tags import get_sharer_content
 from core.utils import get_direction
-from jinja2 import Environment
 from qfdmo.models import DisplayedActeur
 from qfdmo.models.action import get_actions_by_direction
 
@@ -65,20 +60,3 @@ def distance_to_acteur(request, acteur):
         return f"({round(distance_meters / 1000, 1)} km)".replace(".", ",")
     else:
         return f"({round(distance_meters / 10) * 10} m)"
-
-
-def environment(**options):
-    env = Environment(**options)
-    env.globals.update(
-        {
-            "action_by_direction": action_by_direction,
-            "hide_object_filter": hide_object_filter,
-            "distance_to_acteur": distance_to_acteur,
-            "display_exclusivite_reparation": display_exclusivite_reparation,
-            "url": reverse,
-            "static": static,
-            "sharer": get_sharer_content,
-        }
-    )
-    env.filters.update({"linebreaks": linebreaks})
-    return env

core/settings.py

@@ -174,7 +174,11 @@
 
     def show_toolbar_callback(request):
         path_is_not_excluded = not any(p in request.path for p in patterns_to_exclude)
-        # view_is_not_in_iframe_mode = "iframe" not in request.GET
+
+        if request.headers.get("Sec-Fetch-Dest") == "iframe":
+            # Hide in iframe
+            return False
+
         return path_is_not_excluded
 
     patterns_to_exclude = [