Paginated legislation listing

lawlibrary/views/legislation.py

@@ -10,8 +10,8 @@
 
 
 class LegislationListView(BaseLegislationListView):
-    def get_queryset(self):
-        return super().get_queryset().filter(locality=None)
+    def get_base_queryset(self):
+        return super().get_base_queryset().filter(locality=None)
 
 
 class LocalityLegislationView(BaseLocalityLegislationView):

liiweb/templates/liiweb/legislation_list.html

@@ -1,97 +1,56 @@
-{% extends "peachjam/layouts/main.html" %}
+{% extends 'peachjam/layouts/document_list.html' %}
 {% load i18n %}
 {% block title %}
   {% trans 'Legislation' %}
 {% endblock %}
-{% block page-content %}
-  {% block breadcrumbs %}{% endblock %}
-  {% block entity-profile %}
-    {% if entity_profile %}
-      <div class="mt-3">{% include 'peachjam/_entity_profile.html' %}</div>
-    {% endif %}
-  {% endblock %}
-  <section class="pb-5">
-    <div class="container">
-      {% block page-heading %}
-        <h1 class="my-4">{% trans 'Legislation' %}</h1>
-        {% include "peachjam/_help_button.html" with link="legislation/" %}
-      {% endblock %}
-      {% block legislation-nav %}
-        <nav class="nav nav-tabs scroll-xs mb-3 border-bottom">
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'current' %}active{% endif %}"
-               href="{% url 'legislation_list' %}">
-              {% block current_tab_title %}
-                {% trans 'Current legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'recent' %}active{% endif %}"
-               href="{% url 'legislation_list_recent' %}">
-              {% block recent_tab_title %}
-                {% trans 'Recent legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'subleg' %}active{% endif %}"
-               href="{% url 'legislation_list_subsidiary' %}">
-              {% block sublegislation_tab_title %}{{ PEACHJAM_SETTINGS.subleg_label }}{% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'uncommenced' %}active{% endif %}"
-               href="{% url 'legislation_list_uncommenced' %}">
-              {% block uncommenced_tab_title %}
-                {% trans 'Uncommenced legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'repealed' %}active{% endif %}"
-               href="{% url 'legislation_list_repealed' %}">
-              {% block repealed_tab_title %}
-                {% trans 'Repealed legislation' %}
-              {% endblock %}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link {% if view.variant == 'all' %}active{% endif %}"
-               href="{% url 'legislation_list_all' %}">
-              {% trans 'All legislation' %}
-            </a>
-          </li>
-        </nav>
-      {% endblock %}
-      {% if view.variant == 'repealed' %}
-        <div class="alert alert-danger">{% trans 'You are viewing repealed legislation which is no longer in force.' %}</div>
-      {% endif %}
-      <div data-vue-component="LegislationTable"
-           data-initial-sort="{{ legislation_list_sort }}"
-           {% if not doc_table_citations %}data-hide-citations="true"{% endif %}>
-        {% comment %}
-        This ensures that peachjam has links to scrape. This content is replaced when the javacript LegislationTable
-        component runs.
-        {% endcomment %}
-        <ul>
-          {% for item in legislation_table %}
-            <li>
-              <a href="{{ item.work_frbr_uri }}">{{ item.title }}</a>
-              {% if item.children %}
-                <ul>
-                  {% for kid in item.children %}
-                    <li>
-                      <a href="{{ kid.work_frbr_uri }}">{{ kid.title }}</a>
-                    </li>
-                  {% endfor %}
-                </ul>
-              {% endif %}
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-      {{ legislation_table|json_script:"legislation-table" }}
-    </div>
-  </section>
+{% block page-title %}
+  <h1 class="my-4">{% trans 'Legislation' %}</h1>
+{% endblock %}
+{% block nav-tabs %}
+  <nav class="nav nav-tabs scroll-xs mb-3 border-bottom">
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'current' %}active{% endif %}"
+         href="{% url 'legislation_list' %}">
+        {% block current_tab_title %}
+          {% trans 'Current legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'recent' %}active{% endif %}"
+         href="{% url 'legislation_list_recent' %}">
+        {% block recent_tab_title %}
+          {% trans 'Recent legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'subleg' %}active{% endif %}"
+         href="{% url 'legislation_list_subsidiary' %}">
+        {% block sublegislation_tab_title %}{{ PEACHJAM_SETTINGS.subleg_label }}{% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'uncommenced' %}active{% endif %}"
+         href="{% url 'legislation_list_uncommenced' %}">
+        {% block uncommenced_tab_title %}
+          {% trans 'Uncommenced legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'repealed' %}active{% endif %}"
+         href="{% url 'legislation_list_repealed' %}">
+        {% block repealed_tab_title %}
+          {% trans 'Repealed legislation' %}
+        {% endblock %}
+      </a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link {% if view.variant == 'all' %}active{% endif %}"
+         href="{% url 'legislation_list_all' %}">
+        {% trans 'All legislation' %}
+      </a>
+    </li>
+  </nav>
 {% endblock %}

liiweb/views/legislation.py

@@ -6,26 +6,26 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
-from peachjam.helpers import chunks, get_language
+from peachjam.helpers import chunks
 from peachjam.models import JurisdictionProfile, Legislation, Locality, pj_settings
-from peachjam_api.serializers import LegislationSerializer
+from peachjam.views import FilteredDocumentListView
 
 
-class LegislationListView(TemplateView):
+class LegislationListView(FilteredDocumentListView):
     template_name = "liiweb/legislation_list.html"
     variant = "current"
     navbar_link = "legislation"
     model = Legislation
+    queryset = Legislation.objects.prefetch_related(
+        "taxonomies", "taxonomies__topic", "work"
+    )
+    latest_expression_only = True
     extra_context = {"doc_table_citations": True, "legislation_list_sort": "title"}
 
-    def get_queryset(self):
-        qs = (
-            self.model.objects.exclude(published=False)
-            .distinct("work_frbr_uri")
-            .order_by("work_frbr_uri", "-date", "language__pk")
-            .preferred_language(get_language(self.request))
-        )
-        return qs
+    def get_template_names(self):
+        if self.request.htmx:
+            return ["peachjam/faceted_doc_table.html"]
+        return ["liiweb/legislation_list.html"]
 
     def filter_queryset(self, qs):
         if self.variant == "all":
@@ -48,17 +48,13 @@ def filter_queryset(self, qs):
                     datetime.date.today() - timedelta(days=365)
                 ).isoformat()
             )
+        qs = super().filter_queryset(qs)
 
         return qs
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-
-        qs = self.filter_queryset(self.get_queryset())
-        qs = qs.prefetch_related("taxonomies", "taxonomies__topic", "work")
-        qs = self.add_children(qs)
-
-        context["legislation_table"] = LegislationSerializer(qs, many=True).data
+        self.add_children(context["documents"])
 
         site_jurisdictions = pj_settings().document_jurisdictions.all()
         if site_jurisdictions.count() == 1:
@@ -69,6 +65,14 @@ def get_context_data(self, **kwargs):
                 context["entity_profile"] = jurisdiction_profile.entity_profile.first()
                 context["entity_profile_title"] = jurisdiction_profile.jurisdiction.name
 
+        context["doc_table_toggle"] = True
+        context["doc_table_show_doc_type"] = False
+        context["doc_table_show_court"] = False
+        context["doc_table_show_author"] = False
+        context["doc_table_show_jurisdiction"] = False
+
+        context["documents"] = self.group_documents(context["documents"])
+
         return context
 
     def add_children(self, queryset):
@@ -78,18 +82,16 @@ def add_children(self, queryset):
         )
 
         children = defaultdict(list)
-        children_qs = self.get_queryset().filter(
+        children_qs = self.get_base_queryset().filter(
             parent_work_id__in=parents, repealed=False, metadata_json__principal=True
         )
         # group children by parent
         for child in children_qs:
             children[child.parent_work_id].append(child)
 
         # fold in children
-        qs = list(queryset)
-        for parent in qs:
+        for parent in queryset:
             parent.children = children.get(parent.work_id, [])
-        return qs
 
 
 class LocalityLegislationView(TemplateView):

package.json

@@ -34,6 +34,7 @@
     "eslint-plugin-standard": "^4.0.1",
     "eslint-plugin-vue": "^8.5.0",
     "flag-icons": "^6.6.6",
+    "htmx.org": "^2.0.1",
     "i18next": "^22.0.6",
     "i18next-parser": "^6.5.0",
     "lodash.debounce": "^4.0.8",

peachjam/forms.py

@@ -104,6 +104,7 @@ def filter_queryset(self, queryset, exclude=None):
         registries = self.params.getlist("registries")
         attorneys = self.params.getlist("attorneys")
         outcomes = self.params.getlist("outcomes")
+        q = self.params.getlist("q")
 
         queryset = self.order_queryset(queryset, exclude)
 
@@ -140,6 +141,9 @@ def filter_queryset(self, queryset, exclude=None):
         if outcomes and exclude != "outcomes":
             queryset = queryset.filter(outcomes__name__in=outcomes).distinct()
 
+        if q and exclude != "q":
+            queryset = queryset.filter(title__icontains=q[0])
+
         return queryset
 
     def order_queryset(self, queryset, exclude=None):