fix pagination not working with filtering

Signed-off-by: Aayush Kumar <[email protected]>

Author: aayushkdev

scanpipe/filters.py

@@ -522,7 +522,6 @@ def filter(self, qs, value):
 
 
 class ResourceFilterSet(FilterSetUtilsMixin, django_filters.FilterSet):
-
     detected_license_expression = django_filters.ChoiceFilter(
         label="Detected license expression",
         choices=[

scanpipe/templates/scanpipe/includes/filter_sort.html

@@ -1,13 +1,15 @@
 <a
   class="is-black-link"
-  href="?path={{ path|urlencode }}&sort={% if column.is_sorted and column.sort_direction == '-' %}{{ column.field_name }}{% else %}-{{ column.field_name }}{% endif %}"
   {% if is_htmx %}
+    href="?path={{ path|urlencode }}&sort={% if column.is_sorted and column.sort_direction == '-' %}{{ column.field_name }}{% else %}-{{ column.field_name }}{% endif %}"
     hx-get="{% url 'codebase_resource_table' project.slug %}"
     hx-target="#right-pane"
     hx-push-url="false"
     hx-vals='{"path": "{{ path|escapejs }}", "sort": "{% if column.is_sorted and column.sort_direction == '-' %}{{ column.field_name }}{% else %}-{{ column.field_name }}{% endif %}"}'
     onclick="return false;"
     style="cursor:pointer;"
+  {% else %}
+    href="?{{ column.sort_query }}"
   {% endif %}
 >
   {{ column.label }}

scanpipe/templates/scanpipe/panels/resource_table_panel.html

@@ -90,10 +90,14 @@
   {% if is_paginated %}
     <nav class="pagination is-centered mt-4" role="navigation">
       {% if page_obj.has_previous %}
-        <a class="pagination-previous" hx-get="{% url 'codebase_resource_table' project.slug %}?path={{ path }}&page={{ page_obj.previous_page_number }}" hx-target="#right-pane">Previous</a>
+        <a class="pagination-previous"
+           hx-get="{% url 'codebase_resource_table' project.slug %}?{% for key, value in request.GET.items %}{% if key != 'page' and value %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.previous_page_number }}"
+           hx-target="#right-pane">Previous</a>
       {% endif %}
       {% if page_obj.has_next %}
-        <a class="pagination-next" hx-get="{% url 'codebase_resource_table' project.slug %}?path={{ path }}&page={{ page_obj.next_page_number }}" hx-target="#right-pane">Next page</a>
+        <a class="pagination-next"
+           hx-get="{% url 'codebase_resource_table' project.slug %}?{% for key, value in request.GET.items %}{% if key != 'page' and value %}{{ key }}={{ value|urlencode }}&{% endif %}{% endfor %}page={{ page_obj.next_page_number }}"
+           hx-target="#right-pane">Next page</a>
       {% endif %}
       <ul class="pagination-list">
         <li><span class="pagination-ellipsis">Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}</span></li>

scanpipe/views.py

@@ -450,9 +450,10 @@ def get_columns_data(self):
                 column_data["sort_direction"] = sort_direction
 
                 query_dict = self.request.GET.copy()
-                query_dict["sort"] = (
-                    f"{'' if sort_direction == '-' else '-'}{sort_name}"
-                )
+                if is_sorted and sort_direction == "":
+                    query_dict["sort"] = f"-{sort_name}"
+                else:
+                    query_dict["sort"] = sort_name
                 column_data["sort_query"] = query_dict.urlencode()
 
             filter_fieldname = column_data.get("filter_fieldname")
@@ -693,6 +694,9 @@ def get_context_data(self, **kwargs):
         context["reset_form"] = ProjectResetForm()
         context["outputs_download_form"] = ProjectOutputDownloadForm()
         context["report_form"] = ProjectReportForm()
+        context["request"] = (
+            self.request
+        )  # Ensure request is available in template context
         return context
 
     def get_queryset(self):