dnscms: use wagtail pageviewsets everywhere

dnscms/associations/admin.py

@@ -1,7 +1,7 @@
 from django.utils.translation import gettext_lazy as _
 from wagtail.admin.ui.tables import Column, DateColumn
 from wagtail.admin.ui.tables.pages import PageStatusColumn, PageTitleColumn
-from wagtail.admin.viewsets.pages import PageListingViewSet
+from wagtail.admin.viewsets.pages import PageListingViewSet, PageViewSet
 
 from associations.models import AssociationPage
 from dnscms.admin import ListingRedirectChooseParentView
@@ -16,15 +16,11 @@ class AssociationChooseParentView(ListingRedirectChooseParentView):
     listing_url_name = "associations:index"
 
 
-class AssociationPageListingViewSet(PageListingViewSet):
-    model = AssociationPage
-    choose_parent_view_class = AssociationChooseParentView
-    icon = "group"
-    menu_label = _("Associations")
-    menu_order = 2
-    add_to_admin_menu = True
-    ordering = "title"
+class AssociationListingMixin:
+    """Shared model + columns for the standalone listing and the page explorer."""
 
+    model = AssociationPage
+    icon = "group"
     columns = [
         PageTitleColumn("title", label=_("Title"), sort_key="title", classname="title"),
         AssociationTypeColumn(
@@ -43,4 +39,19 @@ class AssociationPageListingViewSet(PageListingViewSet):
     ]
 
 
-association_page_listing_viewset = AssociationPageListingViewSet("associations")
+class AssociationSidebarViewSet(AssociationListingMixin, PageListingViewSet):
+    """Standalone 'Associations' sidebar entry, reached independently of the page tree."""
+
+    choose_parent_view_class = AssociationChooseParentView
+    menu_label = _("Associations")
+    menu_order = 2
+    add_to_admin_menu = True
+    ordering = "title"
+
+
+class AssociationExplorerViewSet(AssociationListingMixin, PageViewSet):
+    """Applies the same columns when navigating into AssociationIndex via the page explorer."""
+
+
+association_sidebar_viewset = AssociationSidebarViewSet("associations")
+association_explorer_viewset = AssociationExplorerViewSet()

dnscms/associations/wagtail_hooks.py

@@ -1,6 +1,6 @@
 from wagtail import hooks
 
-from .admin import association_page_listing_viewset
+from .admin import association_sidebar_viewset, association_explorer_viewset
 from .views import association_chooser_viewset
 
 
@@ -10,5 +10,10 @@ def register_viewset():
 
 
 @hooks.register("register_admin_viewset")
-def register_association_page_listing_viewset():
-    return association_page_listing_viewset
+def register_association_sidebar_viewset():
+    return association_sidebar_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_association_explorer_viewset():
+    return association_explorer_viewset