- {% for case_study_page in value.case_study_items %}
- {% set case_study = case_study_page.specific %}
+ {% for item in value.case_study_items %}
+ {% set case_study = item.page.specific %}
+ {% set item_analytics_id = item.analytics_id %}
{% include 'anonym/includes/case_study_list_item.html' %}
{% endfor %}
diff --git a/bedrock/anonym/templates/anonym/blocks/section.html b/bedrock/anonym/templates/anonym/blocks/section.html
index 4963d6dcd1f..b2e49fdccd4 100644
--- a/bedrock/anonym/templates/anonym/blocks/section.html
+++ b/bedrock/anonym/templates/anonym/blocks/section.html
@@ -22,6 +22,8 @@
{{ cta.label }}
{% endfor %}
{% endif %}
diff --git a/bedrock/anonym/templates/anonym/includes/case_study_list_item.html b/bedrock/anonym/templates/anonym/includes/case_study_list_item.html
index 5c4ffbb0939..c0fcead1fc0 100644
--- a/bedrock/anonym/templates/anonym/includes/case_study_list_item.html
+++ b/bedrock/anonym/templates/anonym/includes/case_study_list_item.html
@@ -5,22 +5,20 @@
#}
+ {% set name = case_study.company_name or case_study.title %}
{% if case_study.logo %}
{% endif %}
-
- {% if case_study.company_name %}
- {{ case_study.company_name }}
- {% else %}
- {{ case_study.title }}
- {% endif %}
-
+ {{ name }}
{% if case_study.description %}
{{ case_study.description }}
{% endif %}
{% set item_url = case_study.link if case_study.link else case_study.url %}
- Case Study
+ Case Study
diff --git a/bedrock/anonym/templates/anonym/includes/navigation.html b/bedrock/anonym/templates/anonym/includes/navigation.html
index d0cd13fb1e8..cb782821672 100644
--- a/bedrock/anonym/templates/anonym/includes/navigation.html
+++ b/bedrock/anonym/templates/anonym/includes/navigation.html
@@ -40,6 +40,10 @@
data-link-text="{{ link_block.link_text }}"
{% if link_block.has_button_appearance %}class="mzan-c-contact-button"{% endif %}
{% if link_block.link.new_window %}target="_blank" rel="noopener"{% endif %}
+ {% if link_block.analytics_id %}
+ data-cta-text="{{ link_block.link_text }}"
+ data-cta-uid="{{ link_block.analytics_id }}"
+ {% endif %}
>
{{ link_block.link_text }}
diff --git a/bedrock/anonym/tests/test_management_commands.py b/bedrock/anonym/tests/test_management_commands.py
new file mode 100644
index 00000000000..ad95941dfe8
--- /dev/null
+++ b/bedrock/anonym/tests/test_management_commands.py
@@ -0,0 +1,361 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from django.core.management import call_command
+
+import pytest
+from wagtail.models import Site
+
+from bedrock.anonym.fixtures.base_fixtures import get_test_anonym_index_page
+from bedrock.anonym.models import (
+ AnonymCaseStudyItemPage,
+ AnonymCaseStudyPage,
+ AnonymContentSubPage,
+ AnonymIndexPage,
+ AnonymNewsItemPage,
+ AnonymNewsPage,
+)
+from bedrock.cms.tests.conftest import minimal_site # noqa: F401
+
+pytestmark = [pytest.mark.django_db]
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _cta_block(anchor_id="cta", label="Contact"):
+ """call_to_action block whose button settings.analytics_id is empty."""
+ return {
+ "type": "call_to_action",
+ "value": {
+ "settings": {"anchor_id": anchor_id},
+ "heading": f"
{label}
",
+ "button": [
+ {
+ "type": "item",
+ "value": {
+ "label": label,
+ "link": {
+ "link_to": "custom_url",
+ "custom_url": "https://example.com",
+ "new_window": False,
+ },
+ "settings": {"analytics_id": ""},
+ },
+ "id": f"btn-{anchor_id}",
+ }
+ ],
+ },
+ "id": f"cta-{anchor_id}",
+ }
+
+
+def _section_block(anchor_id="s", label="Learn More"):
+ """section block whose action link settings.analytics_id is empty."""
+ return {
+ "type": "section",
+ "value": {
+ "settings": {"anchor_id": anchor_id, "theme": ""},
+ "superheading_text": "",
+ "heading_text": "
Test
",
+ "subheading_text": "",
+ "section_content": [],
+ "action": [
+ {
+ "type": "item",
+ "value": {
+ "label": label,
+ "link": {
+ "link_to": "custom_url",
+ "custom_url": "https://example.com",
+ "new_window": False,
+ },
+ "settings": {"analytics_id": ""},
+ },
+ "id": f"action-{anchor_id}",
+ }
+ ],
+ },
+ "id": f"section-{anchor_id}",
+ }
+
+
+def _cs_section_block(case_study_pk, item_id="cs-item-uuid"):
+ """section block with a case_study_item_list_block whose analytics_id is empty."""
+ return {
+ "type": "section",
+ "value": {
+ "settings": {"anchor_id": "cs", "theme": ""},
+ "superheading_text": "",
+ "heading_text": "
Case Studies
",
+ "subheading_text": "",
+ "section_content": [
+ {
+ "type": "case_study_item_list_block",
+ "value": {
+ "case_study_items": [
+ {
+ "type": "item",
+ "value": {"page": case_study_pk, "analytics_id": ""},
+ "id": item_id,
+ }
+ ]
+ },
+ "id": "cs-list",
+ }
+ ],
+ "action": [],
+ },
+ "id": "section-cs",
+ }
+
+
+def _nav_button_link(slug_suffix, has_button=True, analytics_id=None):
+ """navigation link block, optionally with has_button_appearance and/or analytics_id."""
+ value = {
+ "link_text": "Contact",
+ "link": {
+ "link_to": "custom_url",
+ "custom_url": "https://example.com/contact",
+ "new_window": False,
+ },
+ "has_button_appearance": has_button,
+ }
+ if analytics_id is not None:
+ value["analytics_id"] = analytics_id
+ return {"type": "link", "value": value, "id": f"nav-{slug_suffix}"}
+
+
+# ---------------------------------------------------------------------------
+# populate_link_block_analytics_ids
+# ---------------------------------------------------------------------------
+
+
+def test_populate_link_block_analytics_ids_section_action(minimal_site: Site) -> None: # noqa: F811
+ """Injects settings.analytics_id into section.action links that are missing it."""
+ root_page = minimal_site.root_page
+ page = AnonymIndexPage(
+ title="LBAI Section Test",
+ slug="lbai-section-test",
+ content=[_section_block("lbai-s")],
+ )
+ root_page.add_child(instance=page)
+ page.save_revision().publish()
+ # Confirm pre-condition: settings exists but analytics_id is not yet populated
+ assert not list(page.content.raw_data)[0]["value"]["action"][0]["value"]["settings"].get("analytics_id")
+
+ call_command("populate_link_block_analytics_ids")
+
+ page.refresh_from_db()
+ action_link = list(page.content.raw_data)[0]["value"]["action"][0]["value"]
+ assert "settings" in action_link
+ assert action_link["settings"].get("analytics_id")
+
+
+def test_populate_link_block_analytics_ids_cta_button(minimal_site: Site) -> None: # noqa: F811
+ """Injects settings.analytics_id into call_to_action.button links that are missing it."""
+ root_page = minimal_site.root_page
+ page = AnonymIndexPage(
+ title="LBAI CTA Test",
+ slug="lbai-cta-test",
+ content=[_cta_block("lbai-c")],
+ )
+ root_page.add_child(instance=page)
+ page.save_revision().publish()
+ # Confirm pre-condition: settings exists but analytics_id is not yet populated
+ assert not list(page.content.raw_data)[0]["value"]["button"][0]["value"]["settings"].get("analytics_id")
+
+ call_command("populate_link_block_analytics_ids")
+
+ page.refresh_from_db()
+ button = list(page.content.raw_data)[0]["value"]["button"][0]["value"]
+ assert "settings" in button
+ assert button["settings"].get("analytics_id")
+
+
+def test_populate_link_block_analytics_ids_idempotent(minimal_site: Site) -> None: # noqa: F811
+ """Does not overwrite an existing analytics_id when the command is run again."""
+ existing_uid = "fixed-uid-lbai-1234"
+ root_page = minimal_site.root_page
+ section = _section_block("lbai-idem")
+ section["value"]["action"][0]["value"]["settings"] = {"analytics_id": existing_uid}
+ page = AnonymIndexPage(
+ title="LBAI Idempotent Test",
+ slug="lbai-idem-test",
+ content=[section],
+ )
+ root_page.add_child(instance=page)
+ page.save_revision().publish()
+
+ call_command("populate_link_block_analytics_ids")
+
+ page.refresh_from_db()
+ action_link = list(page.content.raw_data)[0]["value"]["action"][0]["value"]
+ assert action_link["settings"]["analytics_id"] == existing_uid
+
+
+def test_populate_link_block_analytics_ids_all_page_types(minimal_site: Site) -> None: # noqa: F811
+ """Processes AnonymIndexPage, AnonymContentSubPage, AnonymNewsItemPage, and AnonymCaseStudyItemPage."""
+ index_page = get_test_anonym_index_page()
+ cta = _cta_block("lbai-all")
+
+ sub_page = AnonymContentSubPage(title="LBAI Sub", slug="lbai-all-sub", content=[cta])
+ index_page.add_child(instance=sub_page)
+ sub_page.save_revision().publish()
+
+ news_page = AnonymNewsPage(title="LBAI News", slug="lbai-all-news")
+ index_page.add_child(instance=news_page)
+ news_page.save_revision().publish()
+ news_item = AnonymNewsItemPage(title="LBAI News Item", slug="lbai-all-news-item", content=[cta])
+ news_page.add_child(instance=news_item)
+ news_item.save_revision().publish()
+
+ cs_page = AnonymCaseStudyPage(title="LBAI CS", slug="lbai-all-cs")
+ index_page.add_child(instance=cs_page)
+ cs_page.save_revision().publish()
+ cs_item = AnonymCaseStudyItemPage(title="LBAI CS Item", slug="lbai-all-cs-item", content=[cta])
+ cs_page.add_child(instance=cs_item)
+ cs_item.save_revision().publish()
+ # Confirm pre-condition: settings exists but analytics_id is not yet populated on any page
+ for page_obj in [sub_page, news_item, cs_item]:
+ assert not list(page_obj.content.raw_data)[0]["value"]["button"][0]["value"]["settings"].get("analytics_id")
+
+ call_command("populate_link_block_analytics_ids")
+
+ for page_obj in [sub_page, news_item, cs_item]:
+ page_obj.refresh_from_db()
+ button = list(page_obj.content.raw_data)[0]["value"]["button"][0]["value"]
+ assert "settings" in button
+ assert button["settings"].get("analytics_id")
+
+
+# ---------------------------------------------------------------------------
+# populate_case_study_analytics_ids
+# ---------------------------------------------------------------------------
+
+
+def test_populate_case_study_analytics_ids_populates_empty_analytics_id(minimal_site: Site) -> None: # noqa: F811
+ """Fills in analytics_id for case_study_item_list_block items where it is empty."""
+ index_page = get_test_anonym_index_page()
+
+ cs_page = AnonymCaseStudyPage(title="PCSA CS", slug="pcsa-cs-page")
+ index_page.add_child(instance=cs_page)
+ cs_page.save_revision().publish()
+ cs_item = AnonymCaseStudyItemPage(title="PCSA CS Item", slug="pcsa-cs-item")
+ cs_page.add_child(instance=cs_item)
+ cs_item.save_revision().publish()
+
+ page = AnonymIndexPage(
+ title="PCSA Index",
+ slug="pcsa-index",
+ content=[_cs_section_block(cs_item.pk)],
+ )
+ minimal_site.root_page.add_child(instance=page)
+ page.save_revision().publish()
+ # Confirm pre-condition: analytics_id exists but is not yet populated
+ item_before = list(page.content.raw_data)[0]["value"]["section_content"][0]["value"]["case_study_items"][0]
+ assert not item_before["value"].get("analytics_id")
+
+ call_command("populate_case_study_analytics_ids")
+
+ page.refresh_from_db()
+ item_value = list(page.content.raw_data)[0]["value"]["section_content"][0]["value"]["case_study_items"][0]["value"]
+ assert item_value["page"] == cs_item.pk
+ assert item_value.get("analytics_id")
+
+
+def test_populate_case_study_analytics_ids_idempotent(minimal_site: Site) -> None: # noqa: F811
+ """Does not overwrite an existing analytics_id when the item is already restructured."""
+ existing_uid = "fixed-uid-pcsa-5678"
+ index_page = get_test_anonym_index_page()
+
+ cs_page = AnonymCaseStudyPage(title="PCSA CS Idem", slug="pcsa-idem-cs")
+ index_page.add_child(instance=cs_page)
+ cs_page.save_revision().publish()
+ cs_item = AnonymCaseStudyItemPage(title="PCSA CS Item Idem", slug="pcsa-idem-cs-item")
+ cs_page.add_child(instance=cs_item)
+ cs_item.save_revision().publish()
+
+ section = _cs_section_block(cs_item.pk, item_id="cs-idem-uuid")
+ # Pre-set the post-migration struct form with an existing analytics_id
+ section["value"]["section_content"][0]["value"]["case_study_items"][0]["value"] = {
+ "page": cs_item.pk,
+ "analytics_id": existing_uid,
+ }
+ page = AnonymIndexPage(
+ title="PCSA Index Idem",
+ slug="pcsa-idem-index",
+ content=[section],
+ )
+ minimal_site.root_page.add_child(instance=page)
+ page.save_revision().publish()
+
+ call_command("populate_case_study_analytics_ids")
+
+ page.refresh_from_db()
+ item_value = list(page.content.raw_data)[0]["value"]["section_content"][0]["value"]["case_study_items"][0]["value"]
+ assert item_value["analytics_id"] == existing_uid
+
+
+# ---------------------------------------------------------------------------
+# populate_nav_button_analytics_ids
+# ---------------------------------------------------------------------------
+
+
+def test_populate_nav_button_analytics_ids_injects_uuid(minimal_site: Site) -> None: # noqa: F811
+ """Injects analytics_id into nav links with has_button_appearance=True."""
+ page = AnonymIndexPage(
+ title="PNBA Inject Test",
+ slug="pnba-inject",
+ navigation=[_nav_button_link("inject")],
+ )
+ minimal_site.root_page.add_child(instance=page)
+ page.save_revision().publish()
+ # Confirm pre-condition: analytics_id exists but is not yet populated
+ assert not list(page.navigation.raw_data)[0]["value"].get("analytics_id")
+
+ call_command("populate_nav_button_analytics_ids")
+
+ page.refresh_from_db()
+ nav_value = list(page.navigation.raw_data)[0]["value"]
+ assert nav_value.get("analytics_id")
+
+
+def test_populate_nav_button_analytics_ids_skips_non_button_links(minimal_site: Site) -> None: # noqa: F811
+ """Does not inject analytics_id into nav links without has_button_appearance."""
+ page = AnonymIndexPage(
+ title="PNBA Skip Test",
+ slug="pnba-skip",
+ navigation=[_nav_button_link("skip", has_button=False)],
+ )
+ minimal_site.root_page.add_child(instance=page)
+ page.save_revision().publish()
+ # Confirm pre-condition: analytics_id is absent on non-button links
+ assert not list(page.navigation.raw_data)[0]["value"].get("analytics_id")
+
+ call_command("populate_nav_button_analytics_ids")
+
+ page.refresh_from_db()
+ nav_value = list(page.navigation.raw_data)[0]["value"]
+ assert not nav_value.get("analytics_id")
+
+
+def test_populate_nav_button_analytics_ids_idempotent(minimal_site: Site) -> None: # noqa: F811
+ """Does not overwrite an existing analytics_id when the command is run again."""
+ existing_uid = "fixed-uid-pnba-9012"
+ page = AnonymIndexPage(
+ title="PNBA Idem Test",
+ slug="pnba-idem",
+ navigation=[_nav_button_link("idem", has_button=True, analytics_id=existing_uid)],
+ )
+ minimal_site.root_page.add_child(instance=page)
+ page.save_revision().publish()
+
+ call_command("populate_nav_button_analytics_ids")
+
+ page.refresh_from_db()
+ nav_value = list(page.navigation.raw_data)[0]["value"]
+ assert nav_value["analytics_id"] == existing_uid
diff --git a/bedrock/anonym/tests/test_models.py b/bedrock/anonym/tests/test_models.py
index 38271eb2c9a..f067615e486 100644
--- a/bedrock/anonym/tests/test_models.py
+++ b/bedrock/anonym/tests/test_models.py
@@ -3,6 +3,7 @@
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
from unittest.mock import patch
+from uuid import uuid4
from django.test import RequestFactory
@@ -922,3 +923,35 @@ def test_legal_rich_text_block_renders_formatted(minimal_site: Site, rf: Request
assert resp.status_code == 200
assert "mzan-legal-rich-text" in page_content
assert "applicable law" in page_content
+
+
+def test_anonym_news_item_page_analytics_id_auto_generated(minimal_site: Site) -> None: # noqa: F811
+ """analytics_id is populated automatically on first save."""
+ index_page = get_test_anonym_index_page()
+ news_page = AnonymNewsPage(title="News Auto UID", slug="news-auto-uid")
+ index_page.add_child(instance=news_page)
+ news_page.save_revision().publish()
+
+ page = AnonymNewsItemPage(slug="test-auto-uid", title="Auto UID Test")
+ news_page.add_child(instance=page)
+ page.save()
+
+ assert page.analytics_id != ""
+ assert len(page.analytics_id) == 36 # UUID v4 string length
+
+
+def test_anonym_news_item_page_analytics_id_not_overwritten(minimal_site: Site) -> None: # noqa: F811
+ """An existing analytics_id is not replaced on subsequent saves."""
+ index_page = get_test_anonym_index_page()
+ news_page = AnonymNewsPage(title="News Preserve UID", slug="news-preserve-uid")
+ index_page.add_child(instance=news_page)
+ news_page.save_revision().publish()
+
+ original_uuid = str(uuid4())
+ page = AnonymNewsItemPage(slug="test-preserve-uid", title="Preserve UID Test", analytics_id=original_uuid)
+ news_page.add_child(instance=page)
+ page.save()
+ page.title = "Updated Title"
+ page.save()
+
+ assert page.analytics_id == original_uuid
diff --git a/bedrock/base/templatetags/helpers.py b/bedrock/base/templatetags/helpers.py
index 648e13c13fa..55f49af3e1f 100644
--- a/bedrock/base/templatetags/helpers.py
+++ b/bedrock/base/templatetags/helpers.py
@@ -11,7 +11,7 @@
from django.contrib.staticfiles.storage import staticfiles_storage
from django.urls import NoReverseMatch
from django.utils.encoding import smart_str
-from django.utils.safestring import mark_safe
+from django.utils.safestring import SafeData, mark_safe
from django.utils.text import slugify
import jinja2
@@ -210,6 +210,33 @@ def add_bedrock_attributes(html):
return str(soup)
+@library.filter
+def add_cta_analytics(html, analytics_id):
+ """
+ Inject data-cta-text and data-cta-uid attributes onto every
tag in an
+ HTML string, for analytics tracking.
+
+ Intended to be chained after the |richtext filter on a NotificationSnippet's
+ notification_text field, where links in freeform rich text cannot receive
+ analytics attributes at render time through the normal template path:
+
+ {{ value.notification_text|richtext|add_cta_analytics(value.analytics_id) }}
+
+ data-cta-text is taken from the link's visible text (nested markup is stripped).
+ data-cta-uid is the analytics_id passed as argument.
+ """
+ if not analytics_id:
+ return html
+ soup = BeautifulSoup(str(html), "html.parser")
+ for link in soup.find_all("a", href=True):
+ link["data-cta-text"] = link.get_text()
+ link["data-cta-uid"] = analytics_id
+ result = str(soup)
+ if isinstance(html, (SafeData, Markup)):
+ return mark_safe(result)
+ return result
+
+
@library.filter
def remove_p_tag(value: str) -> str:
rich_text = RichText(value)
diff --git a/bedrock/base/tests/test_helpers.py b/bedrock/base/tests/test_helpers.py
index 7b1eefc8775..7a004869b35 100644
--- a/bedrock/base/tests/test_helpers.py
+++ b/bedrock/base/tests/test_helpers.py
@@ -4,9 +4,11 @@
from unittest.mock import patch
from django.test import TestCase, override_settings
+from django.utils.safestring import SafeData, mark_safe
import pytest
from django_jinja.backend import Jinja2
+from markupsafe import Markup
from bedrock.base.templatetags import helpers
from lib.l10n_utils import get_translations_native_names
@@ -86,6 +88,93 @@ def test_add_bedrock_attributes(self):
assert processed_html == expected_html
+class TestAddCtaAnalytics:
+ ANALYTICS_ID = "test-uuid-1234"
+
+ def test_adds_attributes_to_links(self):
+ html = ''
+ result = helpers.add_cta_analytics(html, self.ANALYTICS_ID)
+ assert 'data-cta-text="here"' in result
+ assert f'data-cta-uid="{self.ANALYTICS_ID}"' in result
+
+ def test_multiple_links_all_get_attributes(self):
+ link1 = 'First'
+ link2 = '
Second'
+ html = f"
{link1} and {link2}
"
+
+ link1_expected_result = link1.replace("
{link1_expected_result} and {link2_expected_result}"
+
+ result = helpers.add_cta_analytics(html, self.ANALYTICS_ID)
+
+ assert result.count(f'data-cta-uid="{self.ANALYTICS_ID}"') == 2
+ assert expected_result == result
+
+ def test_nested_markup_in_link_text_is_stripped(self):
+ html = 'bold link
'
+
+ expected_result = html.replace("" not in result
+ assert "" not in result
+ assert result.startswith("" not in result
+ assert "" not in result
+ assert result.startswith("" not in result
+ assert "" not in result
+ assert result.startswith("link')
+ result = helpers.add_cta_analytics(html, self.ANALYTICS_ID)
+ assert isinstance(result, SafeData)
+
+ def test_markup_input_returns_safe_output(self):
+ html = Markup('link
')
+ result = helpers.add_cta_analytics(html, self.ANALYTICS_ID)
+ assert isinstance(result, SafeData)
+
+ def test_plain_string_input_returns_plain_string(self):
+ html = 'link
'
+ result = helpers.add_cta_analytics(html, self.ANALYTICS_ID)
+ assert not isinstance(result, (SafeData, Markup))
+
+ def test_empty_analytics_id_returns_html_unchanged(self):
+ html = 'link
'
+ result = helpers.add_cta_analytics(html, "")
+ assert "data-cta" not in result
+ assert result == html
+
+ def test_none_analytics_id_returns_html_unchanged(self):
+ html = 'link
'
+ result = helpers.add_cta_analytics(html, None)
+ assert "data-cta" not in result
+ assert result == html
+
+
@override_settings(LANG_GROUPS={"en": ["en-US", "en-GB"]})
def test_switch():
with patch.object(helpers, "waffle") as waffle:
diff --git a/bedrock/cms/blocks.py b/bedrock/cms/blocks.py
new file mode 100644
index 00000000000..ea2d6989bcc
--- /dev/null
+++ b/bedrock/cms/blocks.py
@@ -0,0 +1,25 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from uuid import uuid4
+
+from wagtail import blocks
+
+
+class UUIDBlock(blocks.CharBlock):
+ """
+ CharBlock that auto-generates a UUID when left blank.
+
+ Used for analytics tracking IDs. Excluded from translation.
+ """
+
+ def clean(self, value):
+ return super().clean(value) or str(uuid4())
+
+ def get_translatable_segments(self, value):
+ # UUIDs are analytics IDs, not user-facing content — exclude from translation
+ return []
+
+ def restore_translated_segments(self, value, segments):
+ return value
diff --git a/bedrock/cms/tests/test_blocks.py b/bedrock/cms/tests/test_blocks.py
new file mode 100644
index 00000000000..cc15035410a
--- /dev/null
+++ b/bedrock/cms/tests/test_blocks.py
@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+from bedrock.cms.blocks import UUIDBlock
+
+
+def test_uuid_block_auto_generates_when_blank():
+ """clean() returns a UUID when the value is blank (requires required=False)."""
+ block = UUIDBlock(required=False)
+ result = block.clean("")
+ assert result != ""
+ assert len(result) == 36 # UUID v4 string length
+
+
+def test_uuid_block_preserves_existing_value():
+ """clean() does not replace a value that is already set."""
+ block = UUIDBlock(required=False)
+ existing = "existing-uuid-value"
+ assert block.clean(existing) == existing
+
+
+def test_uuid_block_excluded_from_translation():
+ """get_translatable_segments() returns empty list so UUIDs are never sent for translation."""
+ block = UUIDBlock()
+ assert block.get_translatable_segments("any-uuid") == []
+
+
+def test_uuid_block_restore_translated_segments_is_noop():
+ """restore_translated_segments() returns the original value unchanged."""
+ block = UUIDBlock()
+ value = "some-uuid"
+ assert block.restore_translated_segments(value, []) == value
diff --git a/bedrock/mozorg/blocks/navigation.py b/bedrock/mozorg/blocks/navigation.py
index 62d27fc0e51..26efde4e9a2 100644
--- a/bedrock/mozorg/blocks/navigation.py
+++ b/bedrock/mozorg/blocks/navigation.py
@@ -38,6 +38,12 @@ class NavigationLinkBlock(blocks.StructBlock):
help_text="This link should look like a button",
)
+ analytics_id = blocks.CharBlock(
+ label="Analytics ID",
+ required=False,
+ help_text="Unique identifier for analytics tracking. Leave blank for standard nav links.",
+ )
+
def clean(self, value):
errors = {}
link = value.get("link", {})
diff --git a/bedrock/mozorg/migrations/0029_alter_advertisingindexpage_sub_navigation.py b/bedrock/mozorg/migrations/0029_alter_advertisingindexpage_sub_navigation.py
new file mode 100644
index 00000000000..27015ce83e4
--- /dev/null
+++ b/bedrock/mozorg/migrations/0029_alter_advertisingindexpage_sub_navigation.py
@@ -0,0 +1,86 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Generated by Django 5.2.12 on 2026-04-16 19:34
+
+from django.db import migrations
+
+import wagtail.admin.forms.choosers
+import wagtail.fields
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("mozorg", "0028_alter_aboutuspage_content_alter_homepage_content"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="advertisingindexpage",
+ name="sub_navigation",
+ field=wagtail.fields.StreamField(
+ [("link", 12)],
+ blank=True,
+ block_lookup={
+ 0: ("wagtail.blocks.CharBlock", (), {"help_text": "Text to display for this navigation link", "max_length": 50}),
+ 1: (
+ "wagtail.blocks.ChoiceBlock",
+ [],
+ {
+ "choices": [
+ ("page", "Page"),
+ ("file", "File"),
+ ("custom_url", "Custom URL"),
+ ("email", "Email"),
+ ("anchor", "Anchor"),
+ ("phone", "Phone"),
+ ],
+ "classname": "link_choice_type_selector",
+ "label": "Link to",
+ "required": False,
+ },
+ ),
+ 2: ("wagtail.blocks.PageChooserBlock", (), {"form_classname": "page_link", "label": "Page", "required": False}),
+ 3: ("wagtail.documents.blocks.DocumentChooserBlock", (), {"form_classname": "file_link", "label": "File", "required": False}),
+ 4: (
+ "wagtail.blocks.CharBlock",
+ (),
+ {
+ "form_classname": "custom_url_link url_field",
+ "label": "Custom URL",
+ "max_length": 300,
+ "required": False,
+ "validators": [wagtail.admin.forms.choosers.URLOrAbsolutePathValidator()],
+ },
+ ),
+ 5: ("wagtail.blocks.CharBlock", (), {"form_classname": "anchor_link", "label": "#", "max_length": 300, "required": False}),
+ 6: ("wagtail.blocks.EmailBlock", (), {"required": False}),
+ 7: ("wagtail.blocks.CharBlock", (), {"form_classname": "phone_link", "label": "Phone", "max_length": 30, "required": False}),
+ 8: ("wagtail.blocks.BooleanBlock", (), {"form_classname": "new_window_toggle", "label": "Open in new window", "required": False}),
+ 9: (
+ "wagtail.blocks.StructBlock",
+ [[("link_to", 1), ("page", 2), ("file", 3), ("custom_url", 4), ("anchor", 5), ("email", 6), ("phone", 7), ("new_window", 8)]],
+ {},
+ ),
+ 10: (
+ "wagtail.blocks.BooleanBlock",
+ (),
+ {"default": False, "help_text": "This link should look like a button", "required": False},
+ ),
+ 11: (
+ "wagtail.blocks.CharBlock",
+ (),
+ {
+ "help_text": "Unique identifier for analytics tracking. Leave blank for standard nav links.",
+ "label": "Analytics ID",
+ "required": False,
+ },
+ ),
+ 12: ("wagtail.blocks.StructBlock", [[("link_text", 0), ("link", 9), ("has_button_appearance", 10), ("analytics_id", 11)]], {}),
+ },
+ help_text="Configure the sub-navigation menu items. Leave empty to use the default navigation.",
+ null=True,
+ ),
+ ),
+ ]
diff --git a/bedrock/mozorg/migrations/0030_notificationsnippet_analytics_id.py b/bedrock/mozorg/migrations/0030_notificationsnippet_analytics_id.py
new file mode 100644
index 00000000000..3958aab8850
--- /dev/null
+++ b/bedrock/mozorg/migrations/0030_notificationsnippet_analytics_id.py
@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Generated by Django 5.2.12 on 2026-04-16 19:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("mozorg", "0029_alter_advertisingindexpage_sub_navigation"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="notificationsnippet",
+ name="analytics_id",
+ field=models.CharField(
+ blank=True, help_text="Unique identifier for analytics tracking of social links in this notification.", max_length=36
+ ),
+ ),
+ ]
diff --git a/bedrock/mozorg/migrations/0031_populate_notification_snippet_analytics_ids.py b/bedrock/mozorg/migrations/0031_populate_notification_snippet_analytics_ids.py
new file mode 100644
index 00000000000..63469c5c3c6
--- /dev/null
+++ b/bedrock/mozorg/migrations/0031_populate_notification_snippet_analytics_ids.py
@@ -0,0 +1,35 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+import sys
+from uuid import uuid4
+
+from django.db import migrations
+
+from bedrock.base.config_manager import config
+
+
+def _should_skip():
+ return "pytest" in sys.modules or config("SQLITE_EXPORT_MODE", parser=bool, default="false")
+
+
+def populate_notification_snippet_analytics_ids(apps, schema_editor):
+ if _should_skip():
+ return
+ NotificationSnippet = apps.get_model("mozorg", "NotificationSnippet")
+ for snippet in NotificationSnippet.objects.filter(analytics_id=""):
+ snippet.analytics_id = str(uuid4())
+ snippet.save(update_fields=["analytics_id"])
+
+
+class Migration(migrations.Migration):
+ atomic = False
+
+ dependencies = [
+ ("mozorg", "0030_notificationsnippet_analytics_id"),
+ ]
+
+ operations = [
+ migrations.RunPython(populate_notification_snippet_analytics_ids, migrations.RunPython.noop),
+ ]
diff --git a/bedrock/mozorg/models.py b/bedrock/mozorg/models.py
index 33ce5eef72e..af5d05941d4 100644
--- a/bedrock/mozorg/models.py
+++ b/bedrock/mozorg/models.py
@@ -2,6 +2,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+from uuid import uuid4
+
from django.conf import settings
from django.core.exceptions import ValidationError
from django.db import models, transaction
@@ -220,6 +222,11 @@ class NotificationSnippet(models.Model):
max_length=255,
blank=True,
)
+ analytics_id = models.CharField(
+ max_length=36,
+ blank=True,
+ help_text="Unique identifier for analytics tracking of social links in this notification.",
+ )
panels = [
MultiFieldPanel(
@@ -228,6 +235,7 @@ class NotificationSnippet(models.Model):
"notification_text",
heading="Notification Text",
),
+ FieldPanel("analytics_id", heading="Analytics ID"),
FieldPanel("linkedin_link", heading="Linkedin Link"),
FieldPanel("tiktok_link", heading="Tiktok Link"),
FieldPanel("spotify_link", heading="Spotify Link"),
@@ -243,6 +251,11 @@ def __str__(self):
return f"{strip_tags(self.notification_text)} - Notification Snippet"
+ def save(self, *args, **kwargs):
+ if not self.analytics_id:
+ self.analytics_id = str(uuid4())
+ super().save(*args, **kwargs)
+
@property
def has_social_links(self):
return any(
diff --git a/bedrock/mozorg/templates/mozorg/cms/snippets/notification_snippet.html b/bedrock/mozorg/templates/mozorg/cms/snippets/notification_snippet.html
index 93b62441965..1129c3055c0 100644
--- a/bedrock/mozorg/templates/mozorg/cms/snippets/notification_snippet.html
+++ b/bedrock/mozorg/templates/mozorg/cms/snippets/notification_snippet.html
@@ -6,38 +6,50 @@
-
{{ value.notification_text|richtext }}
+
{{ value.notification_text|richtext|add_cta_analytics(value.analytics_id) }}
{% if value.linkedin_link or value.tiktok_link or value.spotify_link or value.bluesky_link or value.instagram_link or value.youtube_link %}
diff --git a/bedrock/mozorg/tests/test_models.py b/bedrock/mozorg/tests/test_models.py
index 8776091127c..8aecad28522 100644
--- a/bedrock/mozorg/tests/test_models.py
+++ b/bedrock/mozorg/tests/test_models.py
@@ -2,6 +2,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+from uuid import uuid4
+
from django.core.exceptions import ValidationError
import pytest
@@ -479,3 +481,19 @@ def test_about_us_page_utm_parameters(minimal_site): # noqa: F811
def test_about_us_page_subpage_types():
assert models.LeadershipPage in models.AboutUsPage.subpage_types
+
+
+def test_notification_snippet_analytics_id_auto_generated():
+ """analytics_id is populated automatically on first save."""
+ snippet = factories.NotificationSnippetFactory(analytics_id="")
+ assert snippet.analytics_id != ""
+ assert len(snippet.analytics_id) == 36 # UUID v4 string length
+
+
+def test_notification_snippet_analytics_id_not_overwritten():
+ """An existing analytics_id is not replaced on subsequent saves."""
+ original_uuid = str(uuid4())
+ snippet = factories.NotificationSnippetFactory(analytics_id=original_uuid)
+ snippet.notification_text = "
Updated
"
+ snippet.save()
+ assert snippet.analytics_id == original_uuid