chore: bump version to 1.1.13b2 and update nested plugin for improved sorting with Subquery

Author: mihalikv

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-smartbase-admin"
-version = "1.1.13b1"
+version = "1.1.13b2"
 description = ""
 authors = ["SmartBase <info@smartbase.sk>"]
 readme = "README.md"

src/django_smartbase_admin/plugins/nested.py

@@ -46,7 +46,7 @@
 
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured
-from django.db.models import Case, F, Max, Q, When
+from django.db.models import F, Q, OuterRef, Subquery
 from django.db.models.functions import Coalesce
 
 from django_smartbase_admin.plugins.base import SBAdminPlugin
@@ -384,13 +384,18 @@ def _build_grouped_qs(
         # yields that parent's value — the group sorts by the
         # parent, not by any of its children.
         parent_row = Q(**{f"{parent_field}__isnull": True})
+        column_fields_map = {cf.field: cf for cf in action.column_fields}
         sort_annotations: dict = {}
         new_order: list[str] = []
         for idx, expr in enumerate(order_strings):
             desc = expr.startswith("-")
             field = expr.lstrip("-+")
             alias = f"_nested_sort_{idx}"
-            sort_annotations[alias] = Max(Case(When(parent_row, then=F(field))))
+            visible_field = column_fields_map.get(field)
+            sort_parent_qs = action.get_data_queryset(visible_fields=[visible_field] if visible_field else [])
+            sort_annotations[alias] = Subquery(
+                sort_parent_qs.filter(id=OuterRef("parent_real_id")).values(field)[:1]
+            )
             new_order.append(f"-{alias}" if desc else alias)
         return grouped.annotate(**sort_annotations).order_by(*new_order)
 

src/django_smartbase_admin/static/sb_admin/src/js/tabulator_layouts/fit_data_stretch_grow.js

@@ -49,20 +49,21 @@ function fitDataStretchGrow(columns) {
     })
 
     const targetCol = stretchCol || lastCol
+    const naturalColWidth = targetCol ? targetCol.getWidth() : 0
 
     if(targetCol) {
-        gap = tableWidth - colsWidth + targetCol.getWidth()
+        gap = tableWidth - colsWidth + naturalColWidth
 
         if(this.table.options.responsiveLayout && this.table.modExists("responsiveLayout", true)) {
             targetCol.setWidth(0)
             this.table.modules.responsiveLayout.update()
         }
 
-        if(gap > 0) {
+        if(gap > naturalColWidth) {
             targetCol.setWidth(gap)
             targetCol.modules.fitDataStretchGrowWidth = true
         } else {
-            targetCol.reinitializeWidth()
+            targetCol.setWidth(naturalColWidth)
         }
     } else if(this.table.options.responsiveLayout && this.table.modExists("responsiveLayout", true)) {
         this.table.modules.responsiveLayout.update()