Added 100% coverage for backend, fixed bugs

Author: vsdudakov

fastadmin/api/api.py

@@ -1,6 +1,6 @@
 import logging
 from datetime import datetime, timedelta
-from typing import Any, List
+from typing import Any
 from uuid import UUID
 
 import jwt
@@ -94,11 +94,11 @@ async def list(
     request: Request,
     model: str,
     search: str | None = None,
-    sort_by: str = "-created_at",
+    sort_by: str = None,
     offset: int | None = 0,
     limit: int | None = 10,
     _: UUID | int = Depends(get_user_id),
-) -> dict[str, int | List[Any]]:
+):
     """This method is used to get a list of objects.
 
     :params request: a request object.
@@ -199,7 +199,7 @@ async def export(
     model: str,
     payload: ExportSchema,
     search: str | None = None,
-    sort_by: str = "-created_at",
+    sort_by: str = None,
     _: UUID | int = Depends(get_user_id),
 ):
     """This method is used to export a list of objects.
@@ -285,12 +285,13 @@ async def configuration(
 
         fields_schema = []
         for field_name, field in model_fields.items():
+            is_m2m = model_fields.get(field_name, {}).get("is_m2m")
             list_display = admin_obj.get_list_display()
             column_index = list_display.index(field_name) if field_name in list_display else None
             list_configuration = None
             filter_widget_type = None
             filter_widget_props = None
-            if column_index is not None:
+            if column_index is not None and not is_m2m:
                 if field_name in admin_obj.list_filter:
                     filter_widget_type, filter_widget_props = admin_obj.get_filter_widget(field_name)
                 sorter = True

fastadmin/models/base.py

@@ -13,6 +13,9 @@
 class BaseModelAdmin:
     """Base class for model admin"""
 
+    # Field name for representation of model instance (labels in selects)
+    repr_field = "id"
+
     # Not supported setting
     # actions
 
@@ -382,12 +385,12 @@ def get_fields(self) -> Sequence[str]:
             return [f for f in model_fields if not self.exclude or f not in self.exclude]
         return [f for f in fields if f in model_fields]
 
-    def get_fieldsets(self) -> Sequence[tuple[str | None, dict[str, Sequence[str]]]]:
-        """This method is used to get fieldsets data for form view.
+    # def get_fieldsets(self) -> Sequence[tuple[str | None, dict[str, Sequence[str]]]]:
+    #     """This method is used to get fieldsets data for form view.
 
-        :return: A list of fieldsets data.
-        """
-        return self.fieldsets
+    #     :return: A list of fieldsets data.
+    #     """
+    #     return self.fieldsets
 
     def has_add_permission(self) -> bool:
         """This method is used to check if user has permission to add new model instance.

fastadmin/models/helpers.py

@@ -48,7 +48,7 @@ def get_admin_model(model_name: str) -> BaseModelAdmin | None:
     """
     from fastadmin.app import admin_models
 
-    for model, admin_model in admin_models.items():
+    for model, admin_model_class in admin_models.items():
         if model.__name__ == model_name:
-            return admin_model(model)
+            return admin_model_class(model)
     return None

fastadmin/models/orm/tortoise.py

@@ -20,9 +20,7 @@ async def obj_to_dict(obj: Any, with_m2m: bool = True) -> dict:
     obj_dict = {k: v for k, v in obj.__dict__.items() if not k.startswith("_")}
     if with_m2m:
         for field in obj.__class__._meta.m2m_fields:
-            m2m_rel = getattr(obj, field, None)
-            if m2m_rel is None:
-                continue
+            m2m_rel = getattr(obj, field)
             remote_model = m2m_rel.remote_model
             remote_ids = await m2m_rel.all().values_list(remote_model._meta.pk_attr, flat=True)
             obj_dict[field] = remote_ids
@@ -57,9 +55,7 @@ async def save_model(self, id: UUID | int | None, payload: dict) -> dict | None:
 
         for key, values in payload.items():
             if key in m2m_fields:
-                m2m_rel = getattr(obj, key, None)
-                if m2m_rel is None:
-                    continue
+                m2m_rel = getattr(obj, key)
                 remote_model = m2m_rel.remote_model
                 await m2m_rel.clear()
                 remote_model_objs = []
@@ -117,15 +113,17 @@ async def get_list(
                 field = filter_condition.split("__", 1)[0]
                 if field not in fields:
                     raise HTTPException(
-                        status.HTTP_400_BAD_REQUEST, detail=f"Filter by {filter_condition} is not allowed"
+                        status.HTTP_422_UNPROCESSABLE_ENTITY, detail=f"Filter by {filter_condition} is not allowed"
                     )
                 qs = qs.filter(**{filter_condition: value})
 
         if search:
             if self.search_fields:
                 for field in self.search_fields:
                     if field not in fields:
-                        raise HTTPException(status.HTTP_400_BAD_REQUEST, detail=f"Search by {field} is not allowed")
+                        raise HTTPException(
+                            status.HTTP_422_UNPROCESSABLE_ENTITY, detail=f"Search by {field} is not allowed"
+                        )
                 ids = await asyncio.gather(
                     *(qs.filter(**{f + "__icontains": search}).values_list("id", flat=True) for f in self.search_fields)
                 )
@@ -134,12 +132,15 @@ async def get_list(
 
         if sort_by:
             if sort_by.strip("-") not in fields:
-                raise HTTPException(status.HTTP_400_BAD_REQUEST, detail=f"Sort by {sort_by} is not allowed")
+                raise HTTPException(status.HTTP_422_UNPROCESSABLE_ENTITY, detail=f"Sort by {sort_by} is not allowed")
             qs = qs.order_by(sort_by)
         else:
             if self.ordering:
-                if self.ordering.strip("-") not in fields:
-                    raise HTTPException(status.HTTP_400_BAD_REQUEST, detail=f"Sort by {self.ordering} is not allowed")
+                for sort_by in self.ordering:
+                    if sort_by.strip("-") not in fields:
+                        raise HTTPException(
+                            status.HTTP_422_UNPROCESSABLE_ENTITY, detail=f"Sort by {sort_by} is not allowed"
+                        )
                 qs = qs.order_by(*self.ordering)
 
         total = await qs.count()
@@ -151,8 +152,10 @@ async def get_list(
         if self.list_select_related:
             for field in self.list_select_related:
                 if field not in fields:
-                    raise HTTPException(status.HTTP_400_BAD_REQUEST, detail=f"Select related by {field} is not allowed")
-            qs = qs.select_related(*self.list_select_related)
+                    raise HTTPException(
+                        status.HTTP_422_UNPROCESSABLE_ENTITY, detail=f"Select related by {field} is not allowed"
+                    )
+            qs = qs.select_related(*(f.replace("_id", "") for f in self.list_select_related))
 
         results = await asyncio.gather(*(obj_to_dict(obj, with_m2m=False) for obj in await qs))
 
@@ -186,14 +189,7 @@ def get_model_fields(self) -> OrderedDict[str, dict]:
                 parent_model_label = "id"
                 if parent_admin_model:
                     parent_model_id = parent_admin_model.model_cls._meta.pk_attr
-                    parent_model_label = parent_admin_model.model_cls._meta.pk_attr
-                    parent_fields = parent_admin_model.model_cls._meta.fields_db_projection.keys()
-                    if "name" in parent_fields:
-                        parent_model_label = "name"
-                    elif "title" in parent_fields:
-                        parent_model_label = "title"
-                    elif "email" in parent_fields:
-                        parent_model_label = "email"
+                    parent_model_label = parent_admin_model.repr_field or parent_model_id
 
             form_hidden = (
                 getattr(field, "_generated", False)
@@ -231,7 +227,7 @@ def get_form_widget(self, field_name: str) -> tuple[WidgetType, dict]:
         fields = self.get_model_fields()
         field = fields.get(field_name)
         if not field:
-            raise Exception("Invalid field name %s" % field_name)
+            raise ValueError("Invalid field name %s" % field_name)
         widget_props = {
             "required": field.get("required") or False,
             "disabled": field_name in self.readonly_fields,

fastadmin/static/js/main.min.js

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastadmin"
-version = "0.1.12"
+version = "0.1.13"
 description = ""
 authors = ["Seva D <vsdudakov@gmail.com>"]
 license = "MIT"

fastadmin/static/js/main.min.js.map

@@ -51,6 +51,7 @@ async def test_add_404(objects, client):
     tournament = objects["tournament"]
     event = objects["event"]
     admin_user_cls = objects["admin_user_cls"]
+    unregister_admin_model([event.__class__])
     await sign_in(client, superuser, admin_user_cls)
     r = await client.post(
         f"/api/add/{event.__class__.__name__}",

pyproject.toml

@@ -48,6 +48,7 @@ async def test_change_404_admin_class_found(objects, client):
     superuser = objects["superuser"]
     event = objects["event"]
     admin_user_cls = objects["admin_user_cls"]
+    unregister_admin_model([event.__class__])
     await sign_in(client, superuser, admin_user_cls)
     r = await client.patch(
         f"/api/change/{event.__class__.__name__}/{event.id}",