triv: added caching and parsing enhancements for autocomplete widgets… (#164)

* triv: added caching and parsing enhancements for autocomplete widgets and formset integration adjustments

* triv: added `keep_label` support for widgets and inline table rendering adjustments

* triv: updated cache key generation to include formset prefix and removed unused parameters

* triv: added `hide_label` support for readonly fields and widgets, updated inline table and boolean field rendering

Author: mihalikv

src/django_smartbase_admin/admin/admin_base.py

@@ -881,6 +881,11 @@ def full_clean(self):
                 form.has_changed = lambda: True
         return super().full_clean()
 
+    def _construct_form(self, i, **kwargs):
+        form = super()._construct_form(i, **kwargs)
+        form._sbadmin_formset = self
+        return form
+
 
 class SBAdminGenericInlineFormSet(SBAdminInlineFormSetMixin, BaseGenericInlineFormSet):
     pass

src/django_smartbase_admin/admin/widgets.py

@@ -726,6 +726,7 @@ class SBAdminAutocompleteWidget(
     reload_on_save = None
     full_width = False
     REQUEST_CREATED_DATA_KEY = "autocomplete_created_data"
+    SELECTED_OPTION_CACHE_KEY = "_sbadmin_autocomplete_selected_options"
 
     def __init__(self, form_field=None, *args, **kwargs):
         attrs = kwargs.pop("attrs", None)
@@ -764,6 +765,7 @@ def init_widget_dynamic(
         self, form, form_field, field_name, view, request, default_create_data=None
     ):
         super().init_widget_dynamic(form, form_field, field_name, view, request)
+        self.bound_form = form
         if self.initialised:
             return
         self.initialised = True
@@ -781,6 +783,66 @@ def init_widget_dynamic(
     def get_field_name(self):
         return self.field_name
 
+    def get_selected_option_cache_key(self, request):
+        formset = getattr(getattr(self, "bound_form", None), "_sbadmin_formset", None)
+        return (
+            self.get_id(),
+            getattr(formset, "prefix", None),
+            # Defensive: value_field changes how submitted values map back to rows.
+            self.get_value_field(),
+        )
+
+    def get_selected_option_cache(self, request):
+        cache = getattr(request, self.SELECTED_OPTION_CACHE_KEY, None)
+        if cache is None:
+            cache = {}
+            setattr(request, self.SELECTED_OPTION_CACHE_KEY, cache)
+        return cache
+
+    def get_selected_option_items_from_cache(self, request, parsed_value):
+        formset = getattr(getattr(self, "bound_form", None), "_sbadmin_formset", None)
+        if formset is None:
+            return None
+
+        cache = self.get_selected_option_cache(request)
+        cache_key = self.get_selected_option_cache_key(request)
+        if cache_key not in cache:
+            values = []
+            value_set = set()
+            for form in formset.forms:
+                field = form.fields.get(self.field_name)
+                if field is None or not isinstance(
+                    field.widget, SBAdminAutocompleteWidget
+                ):
+                    continue
+                raw_value = form[self.field_name].value()
+                for value in field.widget.parse_value_list_from_input(
+                    request, raw_value
+                ):
+                    value_key = str(value)
+                    if value_key in value_set:
+                        continue
+                    value_set.add(value_key)
+                    values.append(value)
+
+            items_by_value = {}
+            if values:
+                for item in self.get_queryset(request).filter(
+                    **{f"{self.get_value_field()}__in": values}
+                ):
+                    items_by_value[str(self.get_value(request, item))] = item
+            cache[cache_key] = items_by_value
+
+        items_by_value = cache[cache_key]
+        parsed_values = (
+            parsed_value if isinstance(parsed_value, list) else [parsed_value]
+        )
+        return [
+            items_by_value[str(value)]
+            for value in parsed_values
+            if str(value) in items_by_value
+        ]
+
     def get_context(self, name, value, attrs):
         context = super().get_context(name, value, attrs)
         self.input_id = (
@@ -824,9 +886,14 @@ def get_context(self, name, value, attrs):
                     parsed_value = [parsed_value]
 
                 try:
-                    for item in self.get_queryset(threadsafe_request).filter(
-                        **{f"{self.get_value_field()}{query_suffix}": parsed_value}
-                    ):
+                    items = self.get_selected_option_items_from_cache(
+                        threadsafe_request, parsed_value
+                    )
+                    if items is None:
+                        items = self.get_queryset(threadsafe_request).filter(
+                            **{f"{self.get_value_field()}{query_suffix}": parsed_value}
+                        )
+                    for item in items:
                         selected_options.append(
                             {
                                 "value": self.get_value(threadsafe_request, item),

src/django_smartbase_admin/engine/fake_inline.py

@@ -48,6 +48,11 @@ def save_new(self, form, commit=True):
             form, self.inline_instance.parent_instance, commit
         )
 
+    def _construct_form(self, i, **kwargs):
+        form = super()._construct_form(i, **kwargs)
+        form._sbadmin_formset = self
+        return form
+
 
 class SBAdminFakeInlineMixin:
     fk_name = "inline_fake_relationship"

src/django_smartbase_admin/engine/filter_widgets.py

@@ -1,6 +1,7 @@
 import json
 from datetime import datetime, timedelta
 
+from django import forms
 from django.core.exceptions import ImproperlyConfigured
 from django.contrib.postgres.fields import ArrayField
 from django.db.models import Q, fields, FilteredRelation, Count
@@ -47,6 +48,16 @@ def parse_value_from_input(self, request, input_value):
             value = input_value
         return value
 
+    def parse_value_list_from_input(self, request, input_value):
+        parsed_value = self.parse_value_from_input(request, input_value)
+        if parsed_value in forms.Field.empty_values:
+            return []
+        if not isinstance(parsed_value, list):
+            parsed_value = [parsed_value]
+        return [
+            value for value in parsed_value if value not in forms.Field.empty_values
+        ]
+
     def parse_is_create_from_input(self, request, input_value):
         try:
             input_value = json.loads(input_value)

src/django_smartbase_admin/monkeypatch/admin_readonly_field_monkeypatch.py

@@ -15,19 +15,19 @@ class SBAdminReadonlyField(django.contrib.admin.helpers.AdminReadonlyField):
     readonly_template = "sb_admin/includes/readonly_field.html"
     readonly_boolean_template = "sb_admin/includes/readonly_boolean_field.html"
 
-    def _boolean_field_content(self, value):
+    def _boolean_field_content(self, value, hide_label=False):
         return mark_safe(
             render_to_string(
                 template_name=self.readonly_boolean_template,
                 context={
-                    "field_label": self.field.get("label"),
+                    "field_label": None if hide_label else self.field.get("label"),
                     "field_name": self.field.get("name"),
                     "value": value,
                 },
             ),
         )
 
-    def contents(self, request=None):
+    def contents(self, request=None, hide_label=False):
         admin_site = getattr(self.model_admin, "admin_site", None)
         if getattr(admin_site, "name", None) != sb_admin_site.name:
             return super().contents()
@@ -47,10 +47,11 @@ def contents(self, request=None):
                 # This isn't elegant but suffices for contrib.auth's
                 # ReadOnlyPasswordHashWidget.
                 if getattr(widget, "read_only", False):
-                    return widget.render(field, value)
+                    attrs = {"sbadmin_hide_label": True} if hide_label else None
+                    return widget.render(field, value, attrs=attrs)
             if f is None:
                 if getattr(attr, "boolean", False):
-                    return self._boolean_field_content(value)
+                    return self._boolean_field_content(value, hide_label=hide_label)
                 else:
                     if hasattr(value, "__html__"):
                         result_repr = value
@@ -81,14 +82,14 @@ def contents(self, request=None):
                         result_repr = self.get_admin_url(f.remote_field, value)
                 else:
                     if isinstance(f, models.BooleanField):
-                        return self._boolean_field_content(value)
+                        return self._boolean_field_content(value, hide_label=hide_label)
                     result_repr = display_for_field(value, f, self.empty_value_display)
                 result_repr = linebreaksbr(result_repr)
         return render_to_string(
             template_name=self.readonly_template,
             context={
                 "readonly_content": conditional_escape(result_repr),
-                "field_label": self.field.get("label"),
+                "field_label": None if hide_label else self.field.get("label"),
                 "field_label_suffix": self.form.label_suffix,
             },
         )

src/django_smartbase_admin/static/sb_admin/src/css/_inlines.css

@@ -35,9 +35,6 @@
             @apply relative;
             @apply min-h-56;
             @apply border-b border-dark-200;
-            label:first-child:not(.input-file-edit-btn) {
-                @apply hidden;
-            }
             &:not(:first-child) {
                 @apply border-l;
             }

src/django_smartbase_admin/templates/sb_admin/includes/readonly_boolean_field.html

@@ -3,7 +3,9 @@
         <div class="relative">
             <input type="checkbox" name="{{ field_name }}" id="id_{{ field_name }}" form="#" class="toggle"{% if value %} checked{% endif %} readonly disabled>
             <label for="id_{{ field_name }}"></label>
-            <label for="id_{{ field_name }}">{{ field_label }}</label>
+            {% if field_label %}
+                <label for="id_{{ field_name }}">{{ field_label }}</label>
+            {% endif %}
         </div>
     </div>
-</div>
+</div>

src/django_smartbase_admin/templates/sb_admin/inlines/table_inline.html

@@ -200,10 +200,10 @@
                                                         <td class="djn-td field-{{ field.field.name }}">
                                                             {% if field.is_readonly %}
                                                                 <div class="px-10 py-8">
-                                                                    {% call_method field "contents" request %}
+                                                                    {% call_method field "contents" request True %}
                                                                 </div>
                                                             {% else %}
-                                                                {{ field.field }}
+                                                                {% sb_admin_render_inline_table_field field.field %}
                                                                 {% if field.field.errors %}
                                                                     {{ field.field.errors.as_ul }}
                                                                 {% endif %}

src/django_smartbase_admin/templates/sb_admin/widgets/attrs.html

@@ -1 +1 @@
-{% for name, value in widget.attrs.items %}{% if value is not False %} {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}{% endfor %}
+{% for name, value in widget.attrs.items %}{% if name != "sbadmin_hide_label" and value is not False %} {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}{% endfor %}

src/django_smartbase_admin/templates/sb_admin/widgets/checkbox.html

@@ -1,6 +1,6 @@
 <div class="relative">
     {% include "sb_admin/widgets/input.html" %}
-    {% include 'sb_admin/widgets/includes/simple_field_label.html' %}
+    {% include 'sb_admin/widgets/includes/simple_field_label.html' with keep_label=True %}
     {% include 'sb_admin/widgets/includes/help_text.html' %}
     {{ field.errors }}
 </div>