dnscms: use wagtail pageviewsets everywhere

dnscms/events/admin.py

@@ -3,8 +3,8 @@ from django.utils.translation import gettext, gettext_lazy as _
 from django.utils.translation import ngettext
 from wagtail.admin.ui.tables import Column, DateColumn
 from wagtail.admin.ui.tables.pages import PageStatusColumn, PageTitleColumn
-from wagtail.admin.views.pages.listing import IndexView
-from wagtail.admin.viewsets.pages import PageListingViewSet
+from wagtail.admin.views.pages.listing import ExplorableIndexView, IndexView
+from wagtail.admin.viewsets.pages import PageListingViewSet, PageViewSet
 
 from dnscms.admin import ListingRedirectChooseParentView
 from events.models import EventPage
@@ -32,7 +32,9 @@ class OrganizersColumn(Column):
         return f"{names[0]} (+{len(names) - 1})"
 
 
-class EventPageIndexView(IndexView):
+class EventPagePrefetchMixin:
+    """Prefetch the relations the event columns read, so the listing avoids N+1."""
+
     def annotate_queryset(self, pages):
         pages = super().annotate_queryset(pages)
         return pages.prefetch_related(
@@ -41,20 +43,23 @@ class EventPageIndexView(IndexView):
         )
 
 
+class EventPageIndexView(EventPagePrefetchMixin, IndexView):
+    pass
+
+
+class EventPageExplorableIndexView(EventPagePrefetchMixin, ExplorableIndexView):
+    pass
+
+
 class EventChooseParentView(ListingRedirectChooseParentView):
     listing_url_name = "events:index"
 
 
-class EventPageListingViewSet(PageListingViewSet):
-    model = EventPage
-    index_view_class = EventPageIndexView
-    choose_parent_view_class = EventChooseParentView
-    icon = "date"
-    menu_label = _("Events")
-    menu_order = 1
-    add_to_admin_menu = True
-    ordering = "-latest_revision_created_at"
+class EventListingMixin:
+    """Shared model + columns for the standalone listing and the page explorer."""
 
+    model = EventPage
+    icon = "date"
     columns = [
         PageTitleColumn("title", label=_("Title"), sort_key="title", classname="title"),
         EventDateColumn("event_date", label=_("Date"), width="13%"),
@@ -69,4 +74,22 @@ class EventPageListingViewSet(PageListingViewSet):
     ]
 
 
-event_page_listing_viewset = EventPageListingViewSet("events")
+class EventSidebarViewSet(EventListingMixin, PageListingViewSet):
+    """Standalone 'Events' sidebar entry, reached independently of the page tree."""
+
+    index_view_class = EventPageIndexView
+    choose_parent_view_class = EventChooseParentView
+    menu_label = _("Events")
+    menu_order = 1
+    add_to_admin_menu = True
+    ordering = "-latest_revision_created_at"
+
+
+class EventExplorerViewSet(EventListingMixin, PageViewSet):
+    """Applies the same columns when navigating into EventIndex via the page explorer."""
+
+    index_view_class = EventPageExplorableIndexView
+
+
+event_sidebar_viewset = EventSidebarViewSet("events")
+event_explorer_viewset = EventExplorerViewSet()

dnscms/events/wagtail_hooks.py

@@ -1,6 +1,6 @@
 from wagtail import hooks
 
-from .admin import event_page_listing_viewset
+from .admin import event_sidebar_viewset, event_explorer_viewset
 from .views import event_organizer_chooser_viewset
 
 
@@ -10,5 +10,10 @@ def register_viewset():
 
 
 @hooks.register("register_admin_viewset")
-def register_event_page_listing_viewset():
-    return event_page_listing_viewset
+def register_event_sidebar_viewset():
+    return event_sidebar_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_event_explorer_viewset():
+    return event_explorer_viewset