Meilleure gestion des analytics : rajout de Matomo sur la carte et le formulaire

core/context_processors.py

@@ -33,11 +33,12 @@ def global_context(request) -> dict:
             "POSTHOG_KEY": settings.ASSISTANT["POSTHOG_KEY"],
             "MATOMO_ID": settings.ASSISTANT["MATOMO_ID"],
         },
-        "lvao": {
-            "POSTHOG_KEY": settings.LVAO["POSTHOG_KEY"],
-            "DECLARATION_ACCESSIBILITE_PAGE_ID": settings.LVAO[
+        "carte": {
+            "DECLARATION_ACCESSIBILITE_PAGE_ID": settings.CARTE[
                 "DECLARATION_ACCESSIBILITE_PAGE_ID"
             ],
+            "POSTHOG_KEY": settings.CARTE["POSTHOG_KEY"],
+            "MATOMO_ID": settings.CARTE["MATOMO_ID"],
         },
     }
 

core/settings.py

@@ -38,7 +38,8 @@
 
 # Carte settings
 # --------------
-LVAO = {
+CARTE = {
+    "MATOMO_ID": decouple.config("LVAO_MATOMO_ID", default=50, cast=int),
     "GOOGLE_SEARCH_CONSOLE": "google9dfbbc61adbe3888.html",
     "POSTHOG_KEY": decouple.config(
         "LVAO_POSTHOG_KEY",

core/templatetags/analytics_tags.py

@@ -0,0 +1,13 @@
+from django import template
+
+register = template.Library()
+
+
+@register.inclusion_tag("analytics/matomo.html")
+def matomo(id):
+    return {"matomo_url": "stats.beta.gouv.fr", "matomo_id": id}
+
+
+@register.inclusion_tag("analytics/posthog_data_attributes.html")
+def posthog_data_attributes(key):
+    return {"key": key}

qfdmd/templatetags/qfdmd_tags.py

@@ -2,7 +2,6 @@
 from typing import cast
 
 from django import template
-from django.conf import settings
 from django.core.cache import cache
 from django.forms import FileField
 from django.utils.safestring import mark_safe
@@ -53,6 +52,10 @@ def canonical_url(context: dict) -> dict:
 @register.simple_tag(takes_context=True)
 def pageurl_by_id(context, page_id):
     request = context["request"]
+
+    if not page_id:
+        return ""
+
     try:
         return Page.objects.get(id=page_id).get_full_url(request)
     except Page.DoesNotExist:
@@ -100,11 +103,3 @@ def carte(context, carte_config: CarteConfig) -> dict:
 @register.inclusion_tag("head/favicon.html")
 def favicon() -> dict:
     return {}
-
-
-@register.inclusion_tag("tracking/matomo.html")
-def matomo():
-    return {
-        "matomo_url": "stats.beta.gouv.fr",
-        "matomo_id": settings.ASSISTANT["MATOMO_ID"],
-    }

qfdmo/urls.py

@@ -21,14 +21,14 @@
 
 urlpatterns = [
     # This route needs to be touched with care is it is embedded
-    # on many website, enabling the load of LVAO as an iframe
+    # on many website, enabling the load of Carte / Formulaire as an iframe
     path("static/carte.js", get_carte_iframe_script, name="carte_script"),
     path("static/iframe.js", get_formulaire_iframe_script, name="formulaire_script"),
     path("carte", CarteSearchActeursView.as_view(), name="carte"),
     path("carte/<slug:slug>/", CarteConfigView.as_view(), name="carte_custom"),
     path("carte.json", CarteSearchActeursView.as_view(), name="carte_json"),
     path("formulaire", FormulaireSearchActeursView.as_view(), name="formulaire"),
-    path(settings.LVAO.get("GOOGLE_SEARCH_CONSOLE"), google_verification),
+    path(settings.CARTE.get("GOOGLE_SEARCH_CONSOLE"), google_verification),
     path(
         "donnez-votre-avis",
         RedirectView.as_view(

qfdmo/views/__init__.py

@@ -13,5 +13,5 @@ def get_formulaire_iframe_script(request):
 
 
 def google_verification(request):
-    content = f"google-site-verification: {settings.LVAO.get('GOOGLE_SEARCH_CONSOLE')}"
+    content = f"google-site-verification: {settings.CARTE.get('GOOGLE_SEARCH_CONSOLE')}"
     return HttpResponse(content, content_type="text/plain")

templates/analytics/posthog_data_attributes.html

@@ -0,0 +1,8 @@
+data-analytics-posthog-key-value="{{ key }}"
+data-analytics-posthog-debug-value="{{ POSTHOG_DEBUG|lower }}"
+{% if request.user.is_authenticated %}
+    data-analytics-user-username-value="{{ request.user.username }}"
+    data-analytics-user-email-value="{{ request.user.email }}"
+    data-analytics-user-admin-value="{{ request.user.is_superuser|lower }}"
+{% endif %}
+data-analytics-initial-action-value="{% block analytics_action %}{% endblock %}"

templates/layout/base.html

@@ -1,4 +1,4 @@
-{% load qfdmo_tags static %}
+{% load analytics_tags qfdmo_tags static %}
 <!DOCTYPE html>
 <html
     lang="fr"
@@ -31,6 +31,8 @@
         {% block css_extras %}{% endblock %}
 
         {# Js #}
+        {% matomo carte.MATOMO_ID %}
+
         <script src="{% static 'qfdmo.js' %}"></script>
         {% block javascript_extras %}{% endblock %}
 
@@ -46,17 +48,8 @@
         data-state-address-autocomplete-outlet="[data-controller='address-autocomplete']"
         data-state-map-outlet="[data-controller='map']"
         data-state-search-solution-form-outlet="[data-controller='search-solution-form']"
+        {% posthog_data_attributes carte.POSTHOG_KEY %}
         data-action="address-autocomplete:change->state#setLocation"
-        {# Analytics #}
-        {# TODO: factorize with django-templating-language template as soon as jinja2 will be removed #}
-        data-analytics-posthog-key-value="{{ lvao.POSTHOG_KEY }}"
-        data-analytics-posthog-debug-value="{{ POSTHOG_DEBUG|lower }}"
-        {% if request.user.is_authenticated %}
-            data-analytics-user-username-value="{{ request.user.username }}"
-            data-analytics-user-email-value="{{ request.user.email }}"
-            data-analytics-user-admin-value="{{ request.user.is_superuser|lower }}"
-        {% endif %}
-        data-analytics-initial-action-value="{% block analytics_action %}{% endblock %}"
     >
         <main id="solutions" class="qf-h-full qf-overflow-auto qf-overscroll-none qf-scroll-smooth">
             <noscript>

templates/qfdmd/base.html

@@ -1,4 +1,4 @@
-{% load dsfr_tags qfdmd_tags static wagtailuserbar %}
+{% load analytics_tags dsfr_tags qfdmd_tags static wagtailuserbar %}
 
 {% with contact_modal_id="contact" %}
 
@@ -31,7 +31,7 @@
         {% block social_media %}
         {% endblock social_media %}
 
-        {% matomo %}
+        {% matomo assistant.MATOMO_ID %}
 
         {% block extra_css %}
         {% endblock extra_css %}
@@ -57,15 +57,7 @@
         data-state-map-outlet="[data-controller='map']"
         data-state-address-autocomplete-outlet="[data-controller='address-autocomplete']"
         data-state-search-solution-form-outlet="[data-controller='search-solution-form']"
-        {# Analytics #}
-        data-analytics-posthog-key-value="{{ assistant.POSTHOG_KEY }}"
-        data-analytics-posthog-debug-value="{{ POSTHOG_DEBUG|lower }}"
-        {% if request.user.is_authenticated %}
-            data-analytics-user-username-value="{{ request.user.username }}"
-            data-analytics-user-email-value="{{ request.user.email }}"
-            data-analytics-user-admin-value="{{ request.user.is_superuser|lower }}"
-        {% endif %}
-        data-analytics-initial-action-value="{% block analytics_action %}{% endblock %}"
+        {% posthog_data_attributes assistant.POSTHOG_KEY %}
         {# Actions #}
         data-action="address-autocomplete:change->state#setLocation"
     >