WT-514 - More Anonym Improvements (#17027)

* use correct model names in Wagtail allowed page models and db export

* make sure Person snippet is also in db export

* add fields to AnonymContactPage for form submissions

* handle form submissions for AnonymContactPage

* update tests for form submissions to AnonymContactPage

* add a few more icons for thumbnail icons blocks

* new icons added

* fix borders

* use a honeybot field to reject bot submissions

* use JS to trick bots into submitting to wrong URL

---------

Co-authored-by: Kasey Kelly <[email protected]>

Author: dchukhin

bedrock/anonym/blocks.py

@@ -87,6 +87,7 @@
     ("command-noautohide", "Command Noautohide"),
     ("common-voice", "Common Voice"),
     ("copy", "Copy"),
+    ("current-view", "Current View"),
     ("customize", "Customize"),
     ("cut", "Cut"),
     ("dashboard", "Dashboard"),
@@ -150,8 +151,9 @@
     ("hashtag-narrow", "Hashtag Narrow"),
     ("hashtag", "Hashtag"),
     ("headphone", "Headphone"),
-    ("heart-white", "Heart White"),
     ("heart", "Heart"),
+    ("heart-rate", "Heart Rate"),
+    ("heart-white", "Heart White"),
     ("help", "Help"),
     ("highlight", "Highlight"),
     ("history", "History"),
@@ -166,6 +168,7 @@
     ("labs", "Labs"),
     ("language", "Language"),
     ("library", "Library"),
+    ("layer", "Layer"),
     ("link", "Link"),
     ("listen", "Listen"),
     ("lite", "Lite"),
@@ -295,6 +298,7 @@
     ("undo", "Undo"),
     ("update", "Update"),
     ("user", "User"),
+    ("users", "Users"),
     ("video-card", "Video Card"),
     ("video-recoder-disabled", "Video Recoder Disabled"),
     ("video-recorder", "Video Recorder"),
@@ -315,6 +319,14 @@
     "pricetag-white": "img/icons",
     "rhombus-layers": "img/icons",
     "rhombus-layers-white": "img/icons",
+    "lock": "img/mozorg/anonym",
+    "sparkles": "img/mozorg/anonym",
+    "globe": "img/mozorg/anonym",
+    "dashboard": "img/mozorg/anonym",
+    "users": "img/mozorg/anonym",
+    "current-view": "img/mozorg/anonym",
+    "heart-rate": "img/mozorg/anonym",
+    "layer": "img/mozorg/anonym",
 }
 
 

bedrock/anonym/fixtures/page_fixtures.py

@@ -218,11 +218,23 @@ def get_anonym_contact_test_page() -> AnonymContactPage:
     """
     index_page = get_test_anonym_index_page()
 
+    # Create a thank-you page as the redirect target
+    thank_you_page = AnonymContentSubPage.objects.filter(slug="test-thank-you").first()
+    if not thank_you_page:
+        thank_you_page = AnonymContentSubPage(
+            slug="test-thank-you",
+            title="Thank You",
+        )
+        index_page.add_child(instance=thank_you_page)
+        thank_you_page.save_revision().publish()
+
     test_page = AnonymContactPage.objects.filter(slug="test-contact-page").first()
     if not test_page:
         test_page = AnonymContactPage(
             slug="test-contact-page",
             title="Test Contact Page",
+            to_email_address="[email protected]",
+            redirect_to=thank_you_page,
         )
         index_page.add_child(instance=test_page)
 

bedrock/anonym/migrations/0005_anonymcontactpage_redirect_to_and_more.py

@@ -0,0 +1,36 @@
+# 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.9 on 2026-02-10 18:03
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("anonym", "0004_alter_anonymnewsitempage_content"),
+        ("wagtailcore", "0096_referenceindex_referenceindex_source_object_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="anonymcontactpage",
+            name="redirect_to",
+            field=models.ForeignKey(
+                default=1,
+                help_text="Page to redirect to after a successful form submission (e.g. a thank-you page).",
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="+",
+                to="wagtailcore.page",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="anonymcontactpage",
+            name="to_email_address",
+            field=models.EmailField(default="[email protected]", help_text="Email address where form submissions will be sent.", max_length=254),
+            preserve_default=False,
+        ),
+    ]

bedrock/anonym/migrations/0006_alter_anonymcontentsubpage_content_and_more.py

@@ -2,7 +2,11 @@
 # 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.conf import settings
+from django.core.mail import EmailMessage
 from django.db import models
+from django.shortcuts import redirect
+from django.template.loader import render_to_string
 
 from wagtail.admin.panels import FieldPanel, MultiFieldPanel
 from wagtail.fields import RichTextField, StreamField
@@ -227,11 +231,107 @@ class AnonymContactPage(AbstractBedrockCMSPage):
         help_text="Define the form fields that will appear on the contact page.",
     )
 
+    to_email_address = models.EmailField(
+        help_text="Email address where form submissions will be sent.",
+    )
+
+    redirect_to = models.ForeignKey(
+        "wagtailcore.Page",
+        on_delete=models.PROTECT,
+        related_name="+",
+        help_text="Page to redirect to after a successful form submission (e.g. a thank-you page).",
+    )
+
     content_panels = AbstractBedrockCMSPage.content_panels + [
         FieldPanel("subheading"),
         FieldPanel("form_fields"),
     ]
 
+    settings_panels = AbstractBedrockCMSPage.settings_panels + [
+        MultiFieldPanel(
+            [
+                FieldPanel("to_email_address"),
+                FieldPanel("redirect_to"),
+            ],
+            heading="Form Submission Settings",
+        ),
+    ]
+
+    def get_context(self, request, *args, **kwargs):
+        context = super().get_context(request, *args, **kwargs)
+        form_errors = getattr(request, "form_errors", None)
+        if form_errors:
+            context["form_errors"] = form_errors
+        return context
+
+    def serve(self, request, *args, **kwargs):
+        if request.method == "POST":
+            form_errors = self.validate_form_data(request.POST)
+            if form_errors:
+                request.form_errors = form_errors
+                return super().serve(request, *args, **kwargs)
+
+            self.send_form_email(request)
+            return redirect(self.redirect_to.url)
+
+        return super().serve(request, *args, **kwargs)
+
+    def validate_form_data(self, post_data):
+        """Validate submitted form data against the field configuration.
+
+        Returns a list of error messages. An empty list means the data is valid.
+        """
+        # If the honeypot field has data, then form validation fails.
+        if post_data.get("office_fax", ""):
+            return ["Form submission failed."]
+
+        errors = []
+        has_any_data = False
+
+        for field in self.form_fields:
+            block_type = field.block_type
+            value = field.value
+            identifier = value["settings"]["internal_identifier"]
+            label = value["label"]
+            is_required = value.get("required", False)
+
+            if block_type == "checkbox_group_field":
+                submitted = post_data.getlist(identifier)
+            else:
+                submitted = post_data.get(identifier, "").strip()
+
+            if submitted:
+                has_any_data = True
+
+            if is_required and not submitted:
+                errors.append(f"{label} is required.")
+
+        if not has_any_data:
+            errors.append("Please fill in at least one field.")
+
+        return errors
+
+    def send_form_email(self, request):
+        """Collect form data and send it as an email."""
+        fields = []
+        for field in self.form_fields:
+            block_type = field.block_type
+            value = field.value
+            identifier = value["settings"]["internal_identifier"]
+            label = value["label"]
+
+            if block_type == "checkbox_group_field":
+                submitted = ", ".join(request.POST.getlist(identifier))
+            else:
+                submitted = request.POST.get(identifier, "")
+
+            fields.append({"label": label, "value": submitted})
+
+        msg = render_to_string("anonym/emails/contact-form.txt", {"fields": fields})
+        subject = f"Contact form submission: {self.title}"
+        email = EmailMessage(subject, msg, settings.DEFAULT_FROM_EMAIL, [self.to_email_address])
+        email.send()
+
     class Meta:
         verbose_name = "Anonym Contact Page"
 

bedrock/anonym/models.py

@@ -44,13 +44,28 @@ <h1 class="mzan-heading">{{ page.title }}</h1>
 
     <div class="mzan-contact-form-wrap add-full-width-borders">
       <div class="mzan-section">
-        <form method="post" action="#" class="mzan-contact-form">
+        <form method="post" action="/page-not-found/" data-actn="" class="mzan-contact-form">
           {% csrf_token %}
 
+          {% if form_errors %}
+            <div class="mzan-form-errors">
+              <ul>
+                {% for error in form_errors %}
+                  <li>{{ error }}</li>
+                {% endfor %}
+              </ul>
+            </div>
+          {% endif %}
+
           {% for field in page.form_fields %}
             {% include_block field %}
           {% endfor %}
 
+          <div class="mzan-form-field important-field">
+            <label for="office-fax">Leave this field empty</label>
+            <input type="text" name="office_fax" id="office-fax">
+          </div>
+
           <div class="mzan-form-submit">
             <button type="submit" class="mzp-c-button">Submit</button>
           </div>

bedrock/anonym/templates/anonym/anonym_contact.html

@@ -0,0 +1,8 @@
+A new contact form submission has been received:
+
+------------------------------------
+{% for field in fields %}
++ {{ field.label }}
+{{ field.value }}
+
+{% endfor %}------------------------------------