Fix keyboards for users_handler and make data optional for AdminClusterCallback

handlers/admin/clusters/clusters_handler.py

@@ -54,15 +54,12 @@ async def handle_servers(callback_query: CallbackQuery):
     )
 
 
-@router.callback_query(
-    AdminClusterCallback.filter(F.action == "add"),
-    IsAdminFilter(),
-)
+@router.callback_query(AdminClusterCallback.filter(F.action == "add"), IsAdminFilter())
 async def handle_clusters_add(callback_query: CallbackQuery, state: FSMContext):
     text = (
         "🔧 <b>Введите имя нового кластера:</b>\n\n"
         "<b>Имя должно быть уникальным!</b>\n"
-        "<b>Имя не должно превышать 12 символов!</b>\n"
+        "<b>Имя не должно превышать 12 символов!</b>\n\n"
         "<i>Пример:</i> <code>cluster1</code> или <code>us_east_1</code>"
     )
 

handlers/admin/clusters/keyboard.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from aiogram.filters.callback_data import CallbackData
 from aiogram.types import InlineKeyboardButton, InlineKeyboardMarkup
 from aiogram.utils.keyboard import InlineKeyboardBuilder
@@ -8,7 +10,7 @@ from ..servers.keyboard import AdminServerCallback
 
 class AdminClusterCallback(CallbackData, prefix="admin_cluster"):
     action: str
-    data: str = None
+    data: Optional[str] = None
 
 
 def build_clusters_editor_kb(servers: dict) -> InlineKeyboardMarkup:

handlers/admin/users/users_handler.py

@@ -26,8 +26,8 @@ from database import (
 from filters.admin import IsAdminFilter
 from handlers.keys.key_utils import delete_key_from_cluster, get_user_traffic, renew_key_in_cluster, update_subscription
 from handlers.utils import sanitize_key_name
-from keyboards.admin.panel_kb import AdminPanelCallback, build_admin_back_btn, build_admin_back_kb
-from keyboards.admin.users_kb import (
+from ..panel.keyboard import AdminPanelCallback, build_admin_back_btn, build_admin_back_kb
+from .keyboard import (
     AdminUserEditorCallback,
     AdminUserKeyEditorCallback,
     build_editor_kb,