django-unfold 0.46.0__py3-none-any.whl → 0.47.0__py3-none-any.whl

unfold/contrib/filters/admin.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Tuple, Type
+from typing import Any, Optional
 
 from django.contrib import admin
 from django.contrib.admin.options import ModelAdmin
@@ -36,18 +36,18 @@ class ValueMixin:
         return (
             self.lookup_val[0]
             if self.lookup_val not in EMPTY_VALUES
-            and isinstance(self.lookup_val, List)
+            and isinstance(self.lookup_val, list)
             and len(self.lookup_val) > 0
             else self.lookup_val
         )
 
 
 class MultiValueMixin:
-    def value(self) -> Optional[List[str]]:
+    def value(self) -> Optional[list[str]]:
         return (
             self.lookup_val
             if self.lookup_val not in EMPTY_VALUES
-            and isinstance(self.lookup_val, List)
+            and isinstance(self.lookup_val, list)
             and len(self.lookup_val) > 0
             else self.lookup_val
         )
@@ -72,10 +72,10 @@ class TextFilter(admin.SimpleListFilter):
     def has_output(self) -> bool:
         return True
 
-    def lookups(self, request: HttpRequest, model_admin: ModelAdmin) -> Tuple:
+    def lookups(self, request: HttpRequest, model_admin: ModelAdmin) -> tuple:
         return ()
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         return (
             {
                 "form": self.form_class(
@@ -96,10 +96,10 @@ class FieldTextFilter(ValueMixin, admin.FieldListFilter):
         self.lookup_val = params.get(self.lookup_kwarg)
         super().__init__(field, request, params, model, model_admin, field_path)
 
-    def expected_parameters(self) -> List[str]:
+    def expected_parameters(self) -> list[str]:
         return [self.lookup_kwarg]
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         return (
             {
                 "form": self.form_class(
@@ -116,7 +116,7 @@ class DropdownFilter(admin.SimpleListFilter):
     form_class = DropdownForm
     all_option = ["", _("All")]
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         return (
             {
                 "form": self.form_class(
@@ -186,8 +186,8 @@ class SingleNumericFilter(admin.FieldListFilter):
         self,
         field: Field,
         request: HttpRequest,
-        params: Dict[str, str],
-        model: Type[Model],
+        params: dict[str, str],
+        model: type[Model],
         model_admin: ModelAdmin,
         field_path: str,
     ) -> None:
@@ -222,10 +222,10 @@ class SingleNumericFilter(admin.FieldListFilter):
     def value(self) -> Any:
         return self.used_parameters.get(self.parameter_name, None)
 
-    def expected_parameters(self) -> List[Optional[str]]:
+    def expected_parameters(self) -> list[Optional[str]]:
         return [self.parameter_name]
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         return (
             {
                 "request": self.request,
@@ -242,7 +242,7 @@ class RangeNumericMixin:
     parameter_name = None
     template = "unfold/filters/filters_numeric_range.html"
 
-    def init_used_parameters(self, params: Dict[str, Any]) -> None:
+    def init_used_parameters(self, params: dict[str, Any]) -> None:
         if self.parameter_name + "_from" in params:
             value = params.pop(self.parameter_name + "_from")
 
@@ -284,13 +284,13 @@ class RangeNumericMixin:
         except (ValueError, ValidationError):
             return None
 
-    def expected_parameters(self) -> List[str]:
+    def expected_parameters(self) -> list[str]:
         return [
             f"{self.parameter_name}_from",
             f"{self.parameter_name}_to",
         ]
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         return (
             {
                 "request": self.request,
@@ -314,8 +314,8 @@ class RangeNumericListFilter(RangeNumericMixin, admin.SimpleListFilter):
     def __init__(
         self,
         request: HttpRequest,
-        params: Dict[str, str],
-        model: Type[Model],
+        params: dict[str, str],
+        model: type[Model],
         model_admin: ModelAdmin,
     ) -> None:
         super().__init__(request, params, model, model_admin)
@@ -327,7 +327,7 @@ class RangeNumericListFilter(RangeNumericMixin, admin.SimpleListFilter):
 
     def lookups(
         self, request: HttpRequest, model_admin: ModelAdmin
-    ) -> Tuple[Tuple[str, str], ...]:
+    ) -> tuple[tuple[str, str], ...]:
         return (("dummy", "dummy"),)
 
 
@@ -336,8 +336,8 @@ class RangeNumericFilter(RangeNumericMixin, admin.FieldListFilter):
         self,
         field: Field,
         request: HttpRequest,
-        params: Dict[str, str],
-        model: Type[Model],
+        params: dict[str, str],
+        model: type[Model],
         model_admin: ModelAdmin,
         field_path: str,
     ) -> None:
@@ -366,8 +366,8 @@ class SliderNumericFilter(RangeNumericFilter):
         self,
         field: Field,
         request: HttpRequest,
-        params: Dict[str, str],
-        model: Type[Model],
+        params: dict[str, str],
+        model: type[Model],
         model_admin: ModelAdmin,
         field_path: str,
     ) -> None:
@@ -376,7 +376,7 @@ class SliderNumericFilter(RangeNumericFilter):
         self.field = field
         self.q = model_admin.get_queryset(request)
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         total = self.q.all().count()
         min_value = self.q.all().aggregate(min=Min(self.parameter_name)).get("min", 0)
 
@@ -437,8 +437,8 @@ class RangeDateFilter(admin.FieldListFilter):
         self,
         field: Field,
         request: HttpRequest,
-        params: Dict[str, str],
-        model: Type[Model],
+        params: dict[str, str],
+        model: type[Model],
         model_admin: ModelAdmin,
         field_path: str,
     ) -> None:
@@ -482,13 +482,13 @@ class RangeDateFilter(admin.FieldListFilter):
         except (ValueError, ValidationError):
             return None
 
-    def expected_parameters(self) -> List[str]:
+    def expected_parameters(self) -> list[str]:
         return [
             f"{self.parameter_name}_from",
             f"{self.parameter_name}_to",
         ]
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         return (
             {
                 "request": self.request,
@@ -518,8 +518,8 @@ class RangeDateTimeFilter(admin.FieldListFilter):
         self,
         field: Field,
         request: HttpRequest,
-        params: Dict[str, str],
-        model: Type[Model],
+        params: dict[str, str],
+        model: type[Model],
         model_admin: ModelAdmin,
         field_path: str,
     ) -> None:
@@ -553,7 +553,7 @@ class RangeDateTimeFilter(admin.FieldListFilter):
             value = value[0] if isinstance(value, list) else value
             self.used_parameters[self.field_path + "_to_1"] = value
 
-    def expected_parameters(self) -> List[str]:
+    def expected_parameters(self) -> list[str]:
         return [
             f"{self.parameter_name}_from_0",
             f"{self.parameter_name}_from_1",
@@ -593,7 +593,7 @@ class RangeDateTimeFilter(admin.FieldListFilter):
         except (ValueError, ValidationError):
             return None
 
-    def choices(self, changelist: ChangeList) -> Tuple[Dict[str, Any], ...]:
+    def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         return (
             {
                 "request": self.request,

unfold/contrib/filters/forms.py

@@ -1,7 +1,12 @@
 from django import forms
-from django.forms import ChoiceField, MultipleChoiceField
+from django.contrib.admin.widgets import AutocompleteSelect, AutocompleteSelectMultiple
+from django.db.models import Field as ModelField
+from django.forms import ChoiceField, ModelMultipleChoiceField, MultipleChoiceField
+from django.http import HttpRequest
 from django.utils.translation import gettext_lazy as _
 
+from unfold.admin import ModelAdmin
+
 from ...widgets import (
     INPUT_CLASSES,
     UnfoldAdminSelectMultipleWidget,
@@ -12,7 +17,7 @@ from ...widgets import (
 
 
 class SearchForm(forms.Form):
-    def __init__(self, name, label, *args, **kwargs):
+    def __init__(self, name: str, label: str, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
         self.fields[name] = forms.CharField(
@@ -22,6 +27,50 @@ class SearchForm(forms.Form):
         )
 
 
+class AutocompleteDropdownForm(forms.Form):
+    field = forms.ModelChoiceField
+    widget = AutocompleteSelect
+
+    def __init__(
+        self,
+        request: HttpRequest,
+        name: str,
+        label: str,
+        choices: tuple,
+        field: ModelField,
+        model_admin: ModelAdmin,
+        multiple: bool = False,
+        *args,
+        **kwargs,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+
+        if multiple:
+            self.field = ModelMultipleChoiceField
+            self.widget = AutocompleteSelectMultiple
+
+        self.fields[name] = self.field(
+            label=label,
+            required=False,
+            queryset=field.remote_field.model.objects.all(),
+            widget=self.widget(field, model_admin.admin_site),
+        )
+
+    class Media:
+        js = (
+            "admin/js/vendor/jquery/jquery.js",
+            "admin/js/vendor/select2/select2.full.js",
+            "admin/js/jquery.init.js",
+            "admin/js/autocomplete.js",
+        )
+        css = {
+            "screen": (
+                "admin/css/vendor/select2/select2.css",
+                "admin/css/autocomplete.css",
+            ),
+        }
+
+
 class DropdownForm(forms.Form):
     widget = UnfoldAdminSelectWidget(
         attrs={
@@ -31,7 +80,15 @@ class DropdownForm(forms.Form):
     )
     field = ChoiceField
 
-    def __init__(self, name, label, choices, multiple=False, *args, **kwargs):
+    def __init__(
+        self,
+        name: str,
+        label: str,
+        choices: tuple,
+        multiple: bool = False,
+        *args,
+        **kwargs,
+    ) -> None:
         super().__init__(*args, **kwargs)
 
         if multiple:
@@ -66,8 +123,8 @@ class DropdownForm(forms.Form):
 
 
 class SingleNumericForm(forms.Form):
-    def __init__(self, *args, **kwargs):
-        name = kwargs.pop("name")
+    def __init__(self, name: str, *args, **kwargs) -> None:
+        self.name = name
         super().__init__(*args, **kwargs)
 
         self.fields[name] = forms.FloatField(
@@ -80,10 +137,8 @@ class SingleNumericForm(forms.Form):
 
 
 class RangeNumericForm(forms.Form):
-    name = None
-
-    def __init__(self, *args, **kwargs):
-        self.name = kwargs.pop("name")
+    def __init__(self, name: str, *args, **kwargs) -> None:
+        self.name = name
         super().__init__(*args, **kwargs)
 
         self.fields[self.name + "_from"] = forms.FloatField(
@@ -113,16 +168,14 @@ class SliderNumericForm(RangeNumericForm):
 
 
 class RangeDateForm(forms.Form):
-    name = None
-
     class Media:
         js = [
             "admin/js/calendar.js",
             "unfold/filters/js/DateTimeShortcuts.js",
         ]
 
-    def __init__(self, *args, **kwargs):
-        self.name = kwargs.pop("name")
+    def __init__(self, name: str, *args, **kwargs) -> None:
+        self.name = name
         super().__init__(*args, **kwargs)
 
         self.fields[self.name + "_from"] = forms.DateField(
@@ -148,16 +201,14 @@ class RangeDateForm(forms.Form):
 
 
 class RangeDateTimeForm(forms.Form):
-    name = None
-
     class Media:
         js = [
             "admin/js/calendar.js",
             "unfold/filters/js/DateTimeShortcuts.js",
         ]
 
-    def __init__(self, *args, **kwargs):
-        self.name = kwargs.pop("name")
+    def __init__(self, name: str, *args, **kwargs) -> None:
+        self.name = name
         super().__init__(*args, **kwargs)
 
         self.fields[self.name + "_from"] = forms.SplitDateTimeField(

unfold/contrib/forms/widgets.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 
 from django.core.validators import EMPTY_VALUES
 from django.forms import MultiWidget, Widget
@@ -46,7 +46,7 @@ class ArrayWidget(MultiWidget):
 
         return UnfoldAdminTextInputWidget()
 
-    def get_context(self, name: str, value: str, attrs: Dict) -> Dict:
+    def get_context(self, name: str, value: str, attrs: dict) -> dict:
         self._resolve_widgets(value)
         context = super().get_context(name, value, attrs)
         context.update(
@@ -56,7 +56,7 @@ class ArrayWidget(MultiWidget):
 
     def value_from_datadict(
         self, data: QueryDict, files: MultiValueDict, name: str
-    ) -> List:
+    ) -> list:
         values = []
 
         for item in data.getlist(name):
@@ -67,22 +67,22 @@ class ArrayWidget(MultiWidget):
 
     def value_omitted_from_data(
         self, data: QueryDict, files: MultiValueDict, name: str
-    ) -> List:
+    ) -> list:
         return data.getlist(name) not in [[""], *EMPTY_VALUES]
 
-    def decompress(self, value: Union[str, List]) -> List:
-        if isinstance(value, List):
+    def decompress(self, value: Union[str, list]) -> list:
+        if isinstance(value, list):
             return value
         elif isinstance(value, str):
             return value.split(",")
 
         return []
 
-    def _resolve_widgets(self, value: Optional[Union[List, str]]) -> None:
+    def _resolve_widgets(self, value: Optional[Union[list, str]]) -> None:
         if value is None:
             value = []
 
-        elif isinstance(value, List):
+        elif isinstance(value, list):
             self.widgets = [self.get_widget_instance() for item in value]
         else:
             self.widgets = [self.get_widget_instance() for item in value.split(",")]
@@ -101,7 +101,7 @@ class WysiwygWidget(Widget):
             "unfold/forms/js/trix.config.js",
         )
 
-    def __init__(self, attrs: Optional[Dict[str, Any]] = None) -> None:
+    def __init__(self, attrs: Optional[dict[str, Any]] = None) -> None:
         super().__init__(attrs)
 
         self.attrs.update(

unfold/contrib/inlines/checks.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from django.contrib.admin.checks import InlineModelAdminChecks
 from django.contrib.admin.options import InlineModelAdmin
 from django.core.checks import CheckMessage
@@ -9,10 +7,10 @@ from django.db.models import Model
 class NonrelatedModelAdminChecks(InlineModelAdminChecks):
     def _check_exclude_of_parent_model(
         self, obj: InlineModelAdmin, parent_model: Model
-    ) -> List[CheckMessage]:
+    ) -> list[CheckMessage]:
         return []
 
     def _check_relation(
         self, obj: InlineModelAdmin, parent_model: Model
-    ) -> List[CheckMessage]:
+    ) -> list[CheckMessage]:
         return []

unfold/contrib/simple_history/templates/simple_history/object_history.html

@@ -9,8 +9,24 @@
         </p>
     {% endif %}
 
-    {% if historical_records %}
+    {% if page_obj.object_list %}
         {% include object_history_list_template %}
+        <div class="bg-base-50 flex my-4 items-center p-3 rounded dark:bg-base-800">
+            {% if pagination_required %}
+                {% for i in page_range %}
+                    <span class="pr-4">
+                        {% if i == page_obj.paginator.ELLIPSIS %}
+                            {{ page_obj.paginator.ELLIPSIS }}
+                        {% elif i == page_obj.number %}
+                            <span class="font-medium text-primary-600">{{ i }}</span>
+                        {% else %}
+                            <a href="?{{ page_var }}={{ i }}" {% if i == page_obj.paginator.num_pages %} class="end" {% endif %}>{{ i }}</a>
+                        {% endif %}
+                    </span>
+                {% endfor %}
+            {% endif %}
+            {{ page_obj.paginator.count }} {% blocktranslate count counter=page_obj.paginator.count %}entry{% plural %}entries{% endblocktranslate %}
+        </div>
     {% else %}
         <p class="mb-3 px-3 py-3 rounded text-sm last:mb-8 bg-amber-100 text-amber-600 dark:bg-amber-600/20 dark:border-amber-600/10">
             {% trans "This object doesn't have a change history." %}

unfold/contrib/simple_history/templates/simple_history/object_history_list.html

@@ -39,7 +39,7 @@
     </thead>
 
     <tbody>
-        {% for record in historical_records %}
+        {% for record in page_obj %}
             <tr class="block border mb-3 rounded shadow-sm lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-base-800">
                 <td class="align-middle flex border-t border-base-200 font-normal px-3 py-2 text-left before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto first:border-t-0 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-base-800" data-label="{% trans 'Object' %}">
                     <a href="{% url opts|admin_urlname:'simple_history' object.pk record.pk %}">

unfold/dataclasses.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Callable, Dict, Optional, Union
+from typing import Callable, Optional, Union
 
 from .typing import ActionFunction
 
@@ -10,7 +10,7 @@ class UnfoldAction:
     method: ActionFunction
     description: str
     path: str
-    attrs: Optional[Dict] = None
+    attrs: Optional[dict] = None
     object_id: Optional[Union[int, str]] = None
 
 

unfold/decorators.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable, Dict, Iterable, Optional, Union
+from collections.abc import Iterable
+from typing import Any, Callable, Optional, Union
 
 from django.contrib.admin.options import BaseModelAdmin
 from django.core.exceptions import PermissionDenied
@@ -15,7 +16,7 @@ def action(
     permissions: Optional[Iterable[str]] = None,
     description: Optional[str] = None,
     url_path: Optional[str] = None,
-    attrs: Optional[Dict[str, Any]] = None,
+    attrs: Optional[dict[str, Any]] = None,
 ) -> ActionFunction:
     def decorator(func: Callable) -> ActionFunction:
         def inner(
@@ -62,7 +63,7 @@ def display(
     ordering: Optional[Union[str, Combinable, BaseExpression]] = None,
     description: Optional[str] = None,
     empty_value: Optional[str] = None,
-    label: Optional[Union[bool, str, Dict[str, str]]] = None,
+    label: Optional[Union[bool, str, dict[str, str]]] = None,
     header: Optional[bool] = None,
 ) -> Callable:
     def decorator(func: Callable[[Model], Any]) -> Callable:

unfold/settings.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 from django.conf import settings
 
@@ -72,7 +72,7 @@ def get_config(settings_name=None):
     if settings_name is None:
         settings_name = "UNFOLD"
 
-    def merge_dicts(dict1: Dict[str, Any], dict2: Dict[str, Any]) -> Dict[str, Any]:
+    def merge_dicts(dict1: dict[str, Any], dict2: dict[str, Any]) -> dict[str, Any]:
         result = dict1.copy()
 
         for key, value in dict2.items():