fix: strict field order matching list_display (#58)

Author: artrey

fastadmin/models/helpers.py

@@ -162,10 +162,13 @@ def generate_models_schema(
                 ),
             )
 
-        for column_index, field_name in enumerate(orm_model_fields_for_serialize):
+        for field_name in orm_model_fields_for_serialize:
             display_field_function = getattr(admin_model_obj, field_name, None)
             if not display_field_function or not hasattr(display_field_function, "is_display"):
                 continue
+            if field_name not in column_fields:
+                continue
+            column_index = column_fields.index(field_name)
 
             fields_schema.append(
                 ModelFieldSchema(

tests/conftest.py

@@ -13,6 +13,7 @@
 from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
 from tortoise import Tortoise
 
+from fastadmin import DjangoModelAdmin, PonyORMModelAdmin, SqlAlchemyModelAdmin, TortoiseModelAdmin
 from fastadmin.models.base import admin_models as admin_models_objs
 from fastadmin.models.helpers import get_admin_model
 from fastadmin.settings import settings
@@ -589,6 +590,20 @@ async def event(session_with_type, tortoiseorm_event, django_event, sqlalchemy_e
                 yield obj
 
 
+@pytest.fixture()
+async def base_model_admin(session_with_type):
+    _, session_type = session_with_type
+    match session_type:
+        case "tortoiseorm":
+            yield TortoiseModelAdmin
+        case "djangoorm":
+            yield DjangoModelAdmin
+        case "sqlalchemy":
+            yield SqlAlchemyModelAdmin
+        case "ponyorm":
+            yield PonyORMModelAdmin
+
+
 @pytest.fixture()
 async def admin_models():
     prev_admin_models = {k: copy(v) for k, v in admin_models_objs.items()}

tests/models/test_helpers.py

@@ -1,5 +1,11 @@
-from fastadmin import ModelAdmin
-from fastadmin.models.helpers import get_admin_model, register_admin_model_class, unregister_admin_model_class
+from fastadmin import ModelAdmin, display
+from fastadmin.models.helpers import (
+    generate_models_schema,
+    get_admin_model,
+    get_admin_models,
+    register_admin_model_class,
+    unregister_admin_model_class,
+)
 
 
 async def test_uregister_admin_model_class():
@@ -15,3 +21,31 @@ class OrmModelClass:
     unregister_admin_model_class([OrmModelClass])
     assert not get_admin_model(OrmModelClass.__name__)
     assert not get_admin_model(OrmModelClass)
+
+
+async def test_admin_model_list_configuration_ordering(tournament, base_model_admin):
+    Tournament = tournament.__class__
+
+    class TournamentModelAdmin(base_model_admin):
+        list_display = ("pseudo_name", "name", "another_calculated_field")
+
+        @display
+        def pseudo_name(self, obj: Tournament) -> str:
+            return "Pseudo name"
+
+        @display
+        def another_calculated_field(self, obj: Tournament) -> int:
+            return 0
+
+    model_schema = generate_models_schema({Tournament: TournamentModelAdmin(Tournament)})
+
+    assert model_schema
+    assert len(model_schema) == 1
+
+    list_display = [
+        (field.list_configuration.index, field.name) for field in model_schema[0].fields if field.list_configuration
+    ]
+    list_display.sort()
+    list_display = tuple(name for index, name in list_display)
+
+    assert list_display == TournamentModelAdmin.list_display