add command params

bot/handlers/forms/entity_form_callbacks.py

@@ -1,4 +1,5 @@
 from aiogram import Router, F
+from aiogram.fsm.context import FSMContext
 from aiogram.types import CallbackQuery, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 from sqlmodel.ext.asyncio.session import AsyncSession
@@ -10,7 +11,7 @@ from ....model.settings import Settings
 from ....model import EntityPermission
 from ....utils.main import (
     check_entity_permission,
-    get_value_repr,
+    get_entity_item_repr,
     get_entity_descriptor,
 )
 from ..common.routing import route_callback
@@ -28,6 +29,9 @@ async def entity_delete_callback(query: CallbackQuery, **kwargs):
     user: UserBase = kwargs["user"]
     db_session: AsyncSession = kwargs["db_session"]
     app: "QBotApp" = kwargs["app"]
+    state: FSMContext = kwargs["state"]
+    state_data = await state.get_data()
+    kwargs["state_data"] = state_data
 
     entity_descriptor = get_entity_descriptor(app=app, callback_data=callback_data)
 
@@ -49,12 +53,7 @@ async def entity_delete_callback(query: CallbackQuery, **kwargs):
 
         await route_callback(message=query, **kwargs)
 
-    elif callback_data.data == "no":
-        await route_callback(message=query, back=False, **kwargs)
-
     elif not callback_data.data:
-        field_descriptor = entity_descriptor.fields_descriptors["name"]
-
         entity = await entity_descriptor.type_.get(
             session=db_session, id=int(callback_data.entity_id)
         )
@@ -62,13 +61,7 @@ async def entity_delete_callback(query: CallbackQuery, **kwargs):
         return await query.message.edit_text(
             text=(
                 await Settings.get(Settings.APP_STRINGS_CONFIRM_DELETE_P_NAME)
-            ).format(
-                name=get_value_repr(
-                    value=getattr(entity, field_descriptor.name),
-                    field_descriptor=field_descriptor,
-                    locale=user.lang,
-                )
-            ),
+            ).format(name=get_entity_item_repr(entity=entity)),
             reply_markup=InlineKeyboardBuilder()
             .row(
                 InlineKeyboardButton(
@@ -88,7 +81,6 @@ async def entity_delete_callback(query: CallbackQuery, **kwargs):
                         entity_name=callback_data.entity_name,
                         entity_id=callback_data.entity_id,
                         form_params=callback_data.form_params,
-                        data="no",
                     ).pack(),
                 ),
             )