django-unfold 0.52.0__py3-none-any.whl → 0.54.0__py3-none-any.whl

unfold/templatetags/unfold.py

@@ -1,21 +1,24 @@
+import json
 from collections.abc import Mapping
 from typing import Any, Optional, Union
 
 from django import template
 from django.contrib.admin.helpers import AdminForm, Fieldset
 from django.contrib.admin.views.main import ChangeList
+from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
 from django.db.models import Model
 from django.db.models.options import Options
-from django.forms import Field
+from django.forms import BoundField, Field
 from django.http import HttpRequest
 from django.template import Context, Library, Node, RequestContext, TemplateSyntaxError
 from django.template.base import NodeList, Parser, Token, token_kwargs
 from django.template.loader import render_to_string
-from django.utils.safestring import SafeText
+from django.utils.safestring import SafeText, mark_safe
 
 from unfold.components import ComponentRegistry
 from unfold.dataclasses import UnfoldAction
 from unfold.enums import ActionVariant
+from unfold.widgets import UnfoldAdminSplitDateTimeWidget
 
 register = Library()
 
@@ -107,7 +110,10 @@ def class_name(value: Any) -> str:
 
 @register.filter
 def index(indexable: Mapping[int, Any], i: int) -> Any:
-    return indexable[i]
+    try:
+        return indexable[i]
+    except (KeyError, TypeError):
+        return None
 
 
 @register.filter
@@ -346,7 +352,6 @@ def fieldset_row_classes(context: Context) -> str:
     ]
 
     formset = context.get("inline_admin_formset", None)
-    adminform = context.get("adminform", None)
     line = context.get("line")
 
     # Hide the field in case of ordering field for sorting
@@ -359,28 +364,11 @@ def fieldset_row_classes(context: Context) -> str:
         ):
             classes.append("hidden")
 
-    # Compressed fields special styling
-    if (
-        adminform
-        and hasattr(adminform.model_admin, "compressed_fields")
-        and adminform.model_admin.compressed_fields
-    ):
-        classes.extend(
-            [
-                "lg:border-b",
-                "lg:border-base-200",
-                "lg:border-dashed",
-                "dark:lg:border-base-800",
-                "last:lg:border-b-0",
-            ]
-        )
-
     if len(line.fields) > 1:
         classes.extend(
             [
-                "flex",
-                "flex-row",
-                "flex-wrap",
+                "grid",
+                f"lg:grid-cols-{len(line.fields)}",
             ]
         )
 
@@ -421,7 +409,6 @@ def fieldset_line_classes(context: Context) -> str:
                 "border-base-200",
                 "border-dashed",
                 "group-[.last]/row:border-b-0",
-                "lg:border-b-0",
                 "lg:border-l",
                 "lg:flex-row",
                 "dark:border-base-800",
@@ -451,41 +438,46 @@ def action_item_classes(context: Context, action: UnfoldAction) -> str:
     if variant == ActionVariant.PRIMARY:
         classes.extend(
             [
-                "border-primary-600",
+                "border-primary-700",
                 "bg-primary-600",
                 "text-white",
+                "dark:border-primary-500",
             ]
         )
     elif variant == ActionVariant.DANGER:
         classes.extend(
             [
-                "border-red-600",
+                "border-red-700",
                 "bg-red-600",
                 "text-white",
+                "dark:border-red-500",
             ]
         )
     elif variant == ActionVariant.SUCCESS:
         classes.extend(
             [
-                "border-green-600",
+                "border-green-700",
                 "bg-green-600",
                 "text-white",
+                "dark:border-green-500",
             ]
         )
     elif variant == ActionVariant.INFO:
         classes.extend(
             [
-                "border-blue-600",
+                "border-blue-700",
                 "bg-blue-600",
                 "text-white",
+                "dark:border-blue-500",
             ]
         )
     elif variant == ActionVariant.WARNING:
         classes.extend(
             [
-                "border-orange-600",
+                "border-orange-700",
                 "bg-orange-600",
                 "text-white",
+                "dark:border-orange-500",
             ]
         )
     else:
@@ -493,8 +485,53 @@ def action_item_classes(context: Context, action: UnfoldAction) -> str:
             [
                 "border-base-200",
                 "hover:text-primary-600",
+                "dark:hover:text-primary-500",
                 "dark:border-base-700",
             ]
         )
 
     return " ".join(set(classes))
+
+
+@register.filter
+def changeform_data(adminform: AdminForm) -> str:
+    fields = []
+
+    for fieldset in adminform:
+        for line in fieldset:
+            for field in line:
+                if isinstance(field.field, dict):
+                    continue
+
+                if isinstance(field.field.field.widget, UnfoldAdminSplitDateTimeWidget):
+                    for index, _widget in enumerate(field.field.field.widget.widgets):
+                        fields.append(
+                            f"{field.field.name}{field.field.field.widget.widgets_names[index]}"
+                        )
+                else:
+                    fields.append(field.field.name)
+
+    return mark_safe(json.dumps(dict.fromkeys(fields, "")))
+
+
+@register.filter(takes_context=True)
+def changeform_condition(field: BoundField) -> BoundField:
+    if isinstance(field.field, dict):
+        return field
+
+    if isinstance(field.field.field.widget, RelatedFieldWidgetWrapper):
+        field.field.field.widget.widget.attrs["x-model.fill"] = field.field.name
+        field.field.field.widget.widget.attrs["x-init"] = mark_safe(
+            f"const $ = django.jQuery; $(function () {{ const select = $('#{field.field.auto_id}'); select.on('change', (ev) => {{ {field.field.name} = select.val(); }}); }});"
+        )
+    elif isinstance(field.field.field.widget, UnfoldAdminSplitDateTimeWidget):
+        for index, widget in enumerate(field.field.field.widget.widgets):
+            field_name = (
+                f"{field.field.name}{field.field.field.widget.widgets_names[index]}"
+            )
+
+            widget.attrs["x-model.fill"] = field_name
+    else:
+        field.field.field.widget.attrs["x-model.fill"] = field.field.name
+
+    return field

unfold/utils.py

@@ -15,6 +15,13 @@ from django.utils.safestring import SafeText, mark_safe
 
 from .exceptions import UnfoldException
 
+try:
+    from djmoney.models.fields import MoneyField
+    from djmoney.money import Money
+except ImportError:
+    MoneyField = None
+    Money = None
+
 
 def _boolean_icon(field_val: Any) -> str:
     return render_to_string("unfold/helpers/boolean.html", {"value": field_val})
@@ -89,6 +96,8 @@ def display_for_value(
         return formats.localize(timezone.template_localtime(value))
     elif isinstance(value, (datetime.date, datetime.time)):
         return formats.localize(value)
+    elif Money is not None and isinstance(value, Money):
+        return str(value)
     elif isinstance(value, (int, decimal.Decimal, float)):
         return formats.number_format(value)
     elif isinstance(value, (list, tuple)):
@@ -114,6 +123,8 @@ def display_for_field(value: Any, field: Any, empty_value_display: str) -> str:
         return formats.localize(timezone.template_localtime(value))
     elif isinstance(field, (models.DateField, models.TimeField)):
         return formats.localize(value)
+    elif MoneyField is not None and isinstance(field, MoneyField):
+        return str(value)
     elif isinstance(field, models.DecimalField):
         return formats.number_format(value, field.decimal_places)
     elif isinstance(field, (models.IntegerField, models.FloatField)):

unfold/widgets.py

@@ -146,6 +146,7 @@ CHECKBOX_CLASSES = [
     "border-base-300",
     "cursor-pointer",
     "h-4",
+    "min-w-4",
     "relative",
     "rounded-[4px]",
     "shadow-sm",
@@ -189,6 +190,7 @@ RADIO_CLASSES = [
     "border-base-300",
     "cursor-pointer",
     "h-4",
+    "min-w-4",
     "relative",
     "rounded-full",
     "w-4",