Refactor documentation links developer agreement form

Updated the documentation redirection logic in the `docs` view to use a new `developer_docs` dictionary. Modified the agreement template to include updated links for the Firefox Add-on Distribution Agreement, Review Policies, and FAQ. Adjusted test cases to reflect the removal of outdated documentation links.

Update src/olympia/devhub/templates/devhub/includes/agreement.html

Co-authored-by: Copilot <[email protected]>

Update src/olympia/devhub/templates/devhub/includes/agreement.html

Co-authored-by: Copilot <[email protected]>

Fix test

Fix lint complaint

Author: KevinMind

src/olympia/devhub/templates/devhub/includes/agreement.html

@@ -1,11 +1,27 @@
 <form method="post">
   {% if not agreement_form.has_error('__all__') %}
   <p>
-    {{ agreement_message }}
+    {{ _('Before starting, please read and accept our <a href="{agreement_url}" target="_blank" rel="noopener noreferrer">Firefox Add-on Distribution Agreement</a> as well as our <a href="{policies_url}" target="_blank" rel="noopener noreferrer">Review Policies and Rules</a>, and our <a href="{faq_url}" target="_blank" rel="noopener noreferrer">FAQ</a>. The Firefox Add-on Distribution Agreement also links to our Privacy Notice which explains how we handle your information.')|format_html(
+      agreement_url=url('devhub.docs', 'policies/agreement'),
+      policies_url=url('devhub.docs', 'policies'),
+      faq_url=url('devhub.docs', 'policies/faq'),
+    ) }}
   </p>
   <ul class="agreement-links">
-    <li>{{ agreement_form.distribution_agreement }}<a href="{{ url('devhub.docs', 'policies/agreement') }}" target="_blank" rel="noopener noreferrer">{{ _('Firefox Add-on Distribution Agreement') }}</a> {{ agreement_form.distribution_agreement.errors }}</li>
-    <li>{{ agreement_form.review_policy }}<a href="{{ url('devhub.docs', 'policies/reviews') }}" target="_blank" rel="noopener noreferrer">{{ _('Review Policies and Rules') }}</a> {{ agreement_form.review_policy.errors }}</li>
+    <li>
+      <label for="{{ agreement_form.distribution_agreement.id_for_label }}">
+        {{ agreement_form.distribution_agreement }}
+        {{ _('Firefox Add-on Distribution Agreement') }}
+      </label>
+      {{ agreement_form.distribution_agreement.errors }}
+    </li>
+    <li>
+      <label for="{{ agreement_form.review_policy.id_for_label }}">
+        {{ agreement_form.review_policy }}
+        {{ _('Review Policies and Rules') }}
+      </label>
+      {{ agreement_form.review_policy.errors }}
+    </li>
   </ul>
   <p>
     {{ _('I have read and accept this Agreement and the Rules and Policies') }}.

src/olympia/devhub/tests/test_views.py

@@ -2055,11 +2055,8 @@ def test_doc_urls(self):
         assert '/en-US/developers/docs/te/st', reverse('devhub.docs', args=['te/st'])
 
         urls = [
-            (reverse('devhub.docs', args=['getting-started']), 301),
-            (reverse('devhub.docs', args=['how-to']), 301),
-            (reverse('devhub.docs', args=['how-to/other-addons']), 301),
+            (reverse('devhub.docs', args=['policies']), 301),
             (reverse('devhub.docs', args=['fake-page']), 404),
-            (reverse('devhub.docs', args=['how-to/fake-page']), 404),
             (reverse('devhub.docs'), 301),
         ]
 

src/olympia/devhub/tests/test_views_submit.py

@@ -161,7 +161,9 @@ def test_set_read_dev_agreement_error(self):
         }
         doc = pq(response.content)
         for id_ in form.errors.keys():
-            selector = 'li input#id_%s + a + .errorlist' % id_
+            selector = (
+                'ul.agreement-links li label[for="id_%s"] + ul.errorlist li' % id_
+            )
             assert doc(selector).text() == 'This field is required.'
 
     def test_read_dev_agreement_skip(self):

src/olympia/devhub/views.py

@@ -72,7 +72,6 @@
 from olympia.reviewers.models import Whiteboard
 from olympia.reviewers.utils import ReviewHelper
 from olympia.users.models import (
-    DeveloperAgreementRestriction,
     SuppressedEmailVerification,
 )
 from olympia.users.tasks import send_suppressed_email_confirmation
@@ -1952,26 +1951,20 @@ def request_review(request, addon_id, addon):
 
 
 def docs(request, doc_name=None):
-    mdn_docs = {
+    developer_docs = {
         None: '',
-        'getting-started': '',
-        'reference': '',
-        'how-to': '',
-        'how-to/getting-started': '',
-        'how-to/extension-development': '#Extensions',
-        'how-to/other-addons': '#Other_types_of_add-ons',
-        'how-to/thunderbird-mobile': '#Application-specific',
-        'how-to/theme-development': '#Themes',
-        'themes': '/Themes/Background',
-        'themes/faq': '/Themes/Background/FAQ',
-        'policies': '/AMO/Policy',
-        'policies/reviews': '/AMO/Policy/Reviews',
-        'policies/contact': '/AMO/Policy/Contact',
-        'policies/agreement': '/AMO/Policy/Agreement',
+        'policies': '/documentation/publish/add-on-policies',
+        'policies/faq': '/documentation/publish/add-on-policies-faq',
+        'policies/agreement': (
+            '/documentation/publish/firefox-add-on-distribution-agreement'
+        ),
     }
 
-    if doc_name in mdn_docs:
-        return redirect(MDN_BASE + mdn_docs[doc_name], permanent=True)
+    if doc_name in developer_docs:
+        return redirect(
+            settings.EXTENSION_WORKSHOP_URL + developer_docs[doc_name],
+            permanent=True,
+        )
 
     raise http.Http404()
 
@@ -2009,7 +2002,11 @@ def render_agreement(request, template, next_step, **extra_context):
         # potential errors highlighted)
         context = {
             'agreement_form': form,
-            'agreement_message': str(DeveloperAgreementRestriction.error_message),
+            'agreement_link': absolutify(
+                reverse('devhub.docs', args=['policies/agreement'])
+            ),
+            'policies_link': absolutify(reverse('devhub.docs', args=['policies'])),
+            'faq_link': absolutify(reverse('devhub.docs', args=['policies/faq'])),
         }
         context.update(extra_context)
         return TemplateResponse(request, template, context=context)