Merge remote-tracking branch 'origin/develop' into cy/2447-profile-visibility

# Conflicts:
#	templates/v3/includes/_button.html
#	templates/v3/user_profile_edit.html
#	users/models.py
#	users/views.py

Author: ycanales

config/settings.py

@@ -104,6 +104,7 @@
     "wagtail.images",
     "wagtail.search",
     "wagtail.admin",
+    "wagtail.contrib.routable_page",
     "wagtail",
     "wagtailmarkdown",
     "modelcluster",
@@ -124,6 +125,7 @@
     "slack",
     "testimonials",
     "patches",
+    "pages",
     "asciidoctor_sandbox",
 ]
 
@@ -238,7 +240,7 @@
         "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
         "OPTIONS": {"min_length": 9},
     },
-    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
+    {"NAME": "users.validators.CommonPasswordValidator"},
     {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
 ]
 

config/urls.py

@@ -43,7 +43,7 @@
     StaticContentTemplateView,
     UserGuideTemplateView,
 )
-from marketing.views import PlausibleRedirectView, WhitePaperView
+from marketing.views import PlausibleRedirectView
 from libraries.api import LibrarySearchView
 from libraries.views import (
     LibraryDetail,
@@ -134,11 +134,6 @@
             PlausibleRedirectView.as_view(),
             name="bsm",
         ),
-        path(
-            "outreach/<slug:category>/<slug:slug>",
-            WhitePaperView.as_view(),
-            name="whitepaper",
-        ),
         path(
             "accounts/social/signup/",
             CustomSocialSignupViewView.as_view(),
@@ -424,6 +419,10 @@
         ),
     ]
     + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    + [
+        path("outreach/", include(wagtail_urls)),
+        path("pages/", include(wagtail_urls)),
+    ]
     + [
         # Libraries docs, some HTML parts are re-written
         re_path(
@@ -457,10 +456,6 @@
         ),
     ]
     + djdt_urls
-    + [
-        # Wagtail catch-all (must be last!)
-        path("", include(wagtail_urls)),
-    ]
 )
 
 handler404 = "ak.views.custom_404_view"

config/v3_urls.py

@@ -45,7 +45,7 @@
 """
 
 from django.contrib.admin.views.decorators import staff_member_required
-from django.urls import path
+from django.urls import path, re_path
 
 from core.views import LearnPageView, V3ComponentDemoView
 from news.views import V3AllTypesCreateView
@@ -88,8 +88,11 @@
         V3PasswordResetDoneView.as_view(),
         name="v3-password-reset-done",
     ),
-    path(
-        "v3/accounts/password/reset/key/",
+    # Same uidb36/key shape as allauth's account_reset_password_from_key
+    # route; the view redirects to the ".../key/<uidb36>-set-password/"
+    # placeholder URL after stashing the real key in the session.
+    re_path(
+        r"^v3/accounts/password/reset/key/(?P<uidb36>[0-9A-Za-z]+)-(?P<key>.+)/$",
         V3PasswordResetFromKeyView.as_view(),
         name="v3-password-reset-from-key",
     ),

core/context_processors.py

@@ -213,6 +213,11 @@ class NavLink:
     is_unread: bool = False
 
 
+def edit_profile_url():
+    """Shared CTA URL for the profile edit page."""
+    return f"{reverse('profile-account')}?edit=True"
+
+
 def header_context(request):
     """Context processor for header nav links."""
     nav_links = [
@@ -229,6 +234,7 @@ def header_context(request):
     return {
         "nav_links": nav_links,
         "releases_url": reverse("releases-most-recent"),
+        "edit_profile_url": edit_profile_url(),
     }
 
 

core/mixins.py

@@ -42,6 +42,11 @@ def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
         return context
 
+    def serve(self, request, *args, **kwargs):
+        if not flag_is_active(request, "v3"):
+            raise Http404
+        return super().serve(request, *args, **kwargs)
+
     def get_v3_context_data(self, **kwargs):
         """Override in subclasses to provide v3-specific context."""
         return {**kwargs}
@@ -91,7 +96,9 @@ def get_v3_context_data(self, **kwargs):
         context["background_image_url"] = large_static(
             "img/v3/auth-page/auth-page-background.png"
         )
-        context["login_url"] = reverse_lazy("v3-login")
+        # account_login is the real login page (CustomLoginView renders the
+        # v3 login template); v3-login is only a design-preview route.
+        context["login_url"] = reverse_lazy("account_login")
         context["signup_url"] = reverse_lazy("account_signup")
         context["password_reset_url"] = reverse_lazy("v3-password-reset")
         return context

core/views.py

@@ -2008,6 +2008,16 @@ def get_context_data(self, **kwargs):
                 "badge": BadgeToken.BOOST_DAY,
                 "bio": "Boost Day contributor.",
             },
+            {
+                # Collective author: group icon, no link or role (as produced by
+                # build_library_intro_context for e.g. "Various").
+                "name": "Various Authors",
+                "profile_url": None,
+                "role": None,
+                "avatar_url": "",
+                "badge": "",
+                "bio": "",
+            },
         ]
 
         context["contributor_data"] = 10 * [

libraries/utils.py

@@ -470,6 +470,25 @@ def patch_commit_authors(users):
     return users
 
 
+def apply_collective_author_overrides(author_dicts):
+    """Normalize collective authors (e.g. "Various Authors") in V3 profile dicts.
+
+    A collective author renders as a single labelled group icon with no profile
+    link or role. Mutates each dict in place and returns the same list.
+    """
+    from users.templatetags.avatar_tags import (
+        collective_author_label,
+        is_collective_author,
+    )
+
+    for author in author_dicts:
+        if is_collective_author(author["name"]):
+            author["name"] = collective_author_label(author["name"])
+            author["profile_url"] = None
+            author["role"] = None
+    return author_dicts
+
+
 def build_library_intro_context(
     library_version, *, max_authors=None, include_contributors=False
 ):
@@ -520,6 +539,8 @@ def build_library_intro_context(
         for contributor in top_contributors
     )
 
+    apply_collective_author_overrides(author_dicts)
+
     return {
         "library_name": library.display_name,
         "description": library_version.description or library.description or "",

libraries/views.py

@@ -34,6 +34,7 @@
     Tier,
 )
 from .utils import (
+    apply_collective_author_overrides,
     get_view_from_cookie,
     set_view_in_cookie,
     get_prioritized_library_view,
@@ -572,15 +573,17 @@ def get_v3_context_data(self, **kwargs):
             ]
         )
         context["this_release_contributors"] = (
-            this_release or SharedResources.library_release_contributors
+            apply_collective_author_overrides(this_release)
+            or SharedResources.library_release_contributors
         )
 
         all_time = [
             a.to_v3_profile_dict("Contributor")
             for a in base_context.get("previous_contributors", [])
         ]
         context["all_time_contributors"] = (
-            all_time or SharedResources.library_all_contributors
+            apply_collective_author_overrides(all_time)
+            or SharedResources.library_all_contributors
         )
 
         context["is_flagship_lib"] = self.object.tier == Tier.FLAGSHIP

marketing/models.py

@@ -148,8 +148,15 @@ class DetailPage(EmailCapturePage):
 class OutreachHomePage(Page):
     """A dummy homepage to just return a 404 at the `/outreach/` url"""
 
-    parent_page_types = ["wagtailcore.Page"]
-    subpage_types = ["marketing.ProgramPageIndex", "marketing.TopicPage"]
+    parent_page_types = [
+        "wagtailcore.Page",
+        "pages.RoutableHomePage",
+    ]
+    subpage_types = [
+        "marketing.ProgramPageIndex",
+        "marketing.TopicPage",
+        "testimonials.TestimonialsIndexPage",
+    ]
     max_count = 1  # one container
 
     def route(self, request, path_components):
@@ -158,13 +165,14 @@ def route(self, request, path_components):
         /outreach/program_page/<slug>/ => delegate to ProgramPageIndex -> ProgramPage
         /outreach/<topic>/<detail>/ => delegate to TopicPage -> DetailPage
         """
+        print(path_components)
         if not path_components:
             return RouteResult(self)
 
-        _, second, *rest = path_components
+        first, *rest = path_components
 
         # Fixed segment for program pages
-        if second == "program_page":
+        if first == "program_page":
             try:
                 program_page_index = ProgramPageIndex.objects.child_of(self).get()
             except ProgramPageIndex.DoesNotExist:
@@ -174,7 +182,7 @@ def route(self, request, path_components):
 
         # Otherwise, first segment should be a TopicPage slug
         try:
-            topic = TopicPage.objects.child_of(self).get(slug=second)
+            topic = TopicPage.objects.child_of(self).get(slug=first)
         except TopicPage.DoesNotExist:
             raise Http404("Topic not found")
 

marketing/tests.py

@@ -4,10 +4,6 @@
 import pytest
 
 
-def test_whitepaper_view(tp):
-    tp.assertGoodView("whitepaper", slug="_example")
-
-
 @pytest.mark.parametrize("url_stem", ["qrc", "bsm"])
 def test_plausible_redirect_and_plausible_payload(tp, url_stem):
     """XFF present; querystring preserved; payload/headers correct."""