From bdec7202df358b295aef615cbccabcc59c096c61 Mon Sep 17 00:00:00 2001
From: Yaro Kasear <git@kasear.net>
Date: Thu, 28 Aug 2025 09:56:15 -0500
Subject: [PATCH] Working to expand and improve pager behavior.

---
 crudkit/html/templates/crudkit/_macros.html   | 53 +++++++++++++++++--
 crudkit/html/ui_fragments.py                  | 27 ++++++++--
 .../templates/fragments/_table_fragment.html  |  8 ++-
 3 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/crudkit/html/templates/crudkit/_macros.html b/crudkit/html/templates/crudkit/_macros.html
index 1bcdfd4..23dc1c5 100644
--- a/crudkit/html/templates/crudkit/_macros.html
+++ b/crudkit/html/templates/crudkit/_macros.html
@@ -1,4 +1,5 @@
 {% macro options(items, value_attr="id", label_path="name", getp=None) -%}
+
 {%- for obj in items -%}
 <option value="{{ getp(obj, value_attr) }}">{{ getp(obj, label_path) }}</option>
 {%- endfor -%}
@@ -32,14 +33,56 @@
 {%- endmacro %}
 
 {% macro pager(model, page, pages, per_page, sort, filters, fields_csv) -%}
-<nav id="pager" hx-swap-oob="true">
-    <a hx-get="/ui/{{ model }}/frag/rows?page={{ page-1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
-        hx-target="#rows" rel="prev" hx-swap="innerHTML">Prev</a>
+{#
+<nav id="pager">
+    {% if page > 1 %}
+    <button type="button"
+        hx-get="/ui/{{ model }}/frag/rows?page=1&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+        hx-target="#rows" hx-swap="innerHTML">First</button>
+    <button type="button"
+        hx-get="/ui/{{ model }}/frag/rows?page={{ page-1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+        hx-target="#rows" rel="prev" hx-swap="innerHTML">Prev</button>
+    {% endif %}
 
     <span>Page {{ page }} / {{ pages }}</span>
 
-    <a hx-get="/ui/{{ model }}/frag/rows?page={{ page+1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
-        hx-target="#rows" rel="next" hx-swap="innerHTML">Next</a>
+    {% if page < pages %} <button type="button"
+        hx-get="/ui/{{ model }}/frag/rows?page={{ page+1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+        hx-target="#rows" rel="next" hx-swap="innerHTML">Next</button>
+        <button type="button"
+            hx-get="/ui/{{ model }}/frag/rows?page={{ pages }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+            hx-target="#rows" hx-swap="innerHTML">Last</button>
+        {% endif %}
+</nav>
+#}
+<nav id="pager">
+    <ul class="pagination justify-content-center bg-white">
+        <li class="page-item {%- if page <= 1 %} disabled{% endif %}">
+            <a class="page-link"
+            hx-get="/ui/{{ model }}/frag/rows?page={{ page - 1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+            hx-target="#rows" hx-swap="innerHTML" {%- if page <= 1 %} hx-disable{% endif %}>Prev</a>
+        </li>
+        <li class="page-item {%- if page <= 1 %} disabled{% endif %}">
+            <a class="page-link"
+            hx-get="/ui/{{ model }}/frag/rows?page=1&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+            hx-target="#rows" hx-swap="innerHTML" {%- if page <= 1 %} hx-disable{% endif %}>1</a>
+        </li>
+        {% if pages > 1 %}
+        <li class="page-item"><a class="page-link">...</a></li>
+        <li class="page-item"><a class="page-link">...</a></li>
+        <li class="page-item {%- if page >= pages %} disabled{% endif %}">
+            <a class="page-link"
+            hx-get="/ui/{{ model }}/frag/rows?page={{ pages }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+            hx-target="#rows" hx-swap="innerHTML" {%- if page >= pages %} hx-disable{% endif %}>{{ pages }}</a>
+        </li>
+        {% endif %}
+        <li class="page-item {%- if page >= pages %} disabled{% endif %}">
+            <a class="page-link"
+            hx-get="/ui/{{ model }}/frag/rows?page={{ page + 1 }}&per_page={{ per_page }}{% if sort %}&sort={{ sort }}{% endif %}{% if fields_csv %}&fields_csv={{ fields_csv|urlencode }}{% endif %}{% for k,v in filters.items() %}&{{k}}={{ v|urlencode }}{% endfor %}"
+            hx-target="#rows" hx-swap="innerHTML" {%- if page >= pages %} hx-disable{% endif %}>Next</a>
+        </li>
+    </ul>
+    <span>Page {{ page }} / {{ pages }}</span>
 </nav>
 {%- endmacro %}
 
diff --git a/crudkit/html/ui_fragments.py b/crudkit/html/ui_fragments.py
index d89bb7a..c356611 100644
--- a/crudkit/html/ui_fragments.py
+++ b/crudkit/html/ui_fragments.py
@@ -106,14 +106,31 @@ def make_fragments_blueprint(db_session_factory, registry: Dict[str, Any], *, na
         expand = _collect_expand_from_paths(fields)
         spec = QuerySpec(filters=filters, order_by=[sort] if sort else [], page=page, per_page=per_page, expand=expand)
         s = session(); svc = CrudService(s, default_eager_policy)
-        rows, total = svc.list(Model, spec)
+        rows, _ = svc.list(Model, spec)
+
+        html = render_template("crudkit/rows.html", items=rows, fields=fields, getp=_getp)
+
+        return html
+
+    @bp.get("/<model>/frag/pager")
+    def pager(model):
+        Model = registry.get(model) or abort(404)
+        page = request.args.get("page", type=int) or 1
+        per_page = request.args.get("per_page", type=int) or 20
+        filters = _parse_filters(request.args)
+        sort = request.args.get("sort")
+        fields_csv = request.args.get("fields_csv") or "id,name"
+        fields = _paths_from_csv(fields_csv)
+        expand = _collect_expand_from_paths(fields)
+
+        spec = QuerySpec(filters=filters, order_by=[sort] if sort else [], page=page, per_page=per_page, expand=expand)
+        s = session(); svc = CrudService(s, default_eager_policy)
+        _, total = svc.list(Model, spec)
         pages = max(1, ceil(total / per_page))
 
-        rows_html = render_template("crudkit/rows.html", items=rows, fields=fields, getp=_getp)
-        pager_html = render_template("crudkit/pager.html", model=model, page=page, pages=pages,
+        html = render_template("crudkit/pager.html", model=model, page=page, pages=pages,
                                      per_page=per_page, sort=sort, filters=filters, fields_csv=fields_csv)
-
-        return rows_html + pager_html
+        return html
 
     @bp.get("/<model>/frag/form")
     def form(model):
diff --git a/inventory/templates/fragments/_table_fragment.html b/inventory/templates/fragments/_table_fragment.html
index f923155..2ba1762 100644
--- a/inventory/templates/fragments/_table_fragment.html
+++ b/inventory/templates/fragments/_table_fragment.html
@@ -76,12 +76,16 @@ refresh_url=none, model=none) %}
             </tr>
         </thead>
         <tbody id="rows"
-            hx-get="/ui/{{ model }}/frag/rows?page={{ page }}&{{ per_page }}&fields_csv={{ fields|join(',') }}"
+            hx-get="/ui/{{ model }}/frag/rows?page={{ page }}&per_page{{ per_page }}&fields_csv={{ fields|join(',') }}"
             hx-trigger="load"
             hx-target="#rows"
             hx-swap="innerHTML">
         </tbody>
     </table>
-    <div id="pager"></div>
+    <div id="pager"
+        hx-get="/ui/{{ model }}/frag/pager?page={{ page }}&per_page={{ per_page }}&fields_csv={{ fields|join(',') }}"
+        hx-trigger="load, htmx:afterSwap from:#rows"
+        hx-target="#pager"
+        hx-swap="outerHTML"></div>
 </div>
 {% endmacro %}
\ No newline at end of file