fix: orval query param generation

Author: M03ED

app/node/__init__.py

@@ -14,19 +14,6 @@
 }
 
 
-def calculate_max_message_size(active_users_count: int) -> int:
-    """
-    max_message_size to 64MB.
-
-    Args:
-        active_users_count: Number of active users in the system
-
-    Returns:
-        int: Max message size in bytes (64MB)
-    """
-    return 64 * 1024 * 1024  # 64MB
-
-
 class NodeManager:
     def __init__(self):
         self._nodes: dict[int, PasarGuardNode] = {}
@@ -136,4 +123,4 @@ async def update_user(self, user: ProtoUser) -> None:
 node_manager: NodeManager = NodeManager()
 
 
-__all__ = ["calculate_max_message_size", "core_users", "node_manager"]
+__all__ = ["core_users", "node_manager"]

app/operation/node.py

@@ -59,7 +59,7 @@
     validate_user_count_metric_scope,
 )
 from app.nats.node_rpc import node_nats_client
-from app.node import calculate_max_message_size, core_users, node_manager
+from app.node import core_users, node_manager
 from app.operation import BaseOperation, OperatorType
 from app.utils.logger import get_logger
 from config import runtime_settings
@@ -191,7 +191,9 @@ async def _update_single_node_status(
             asyncio.create_task(notification.error_node(node_notif))
 
     @staticmethod
-    async def _get_core_users_map(db: AsyncSession, core_ids: set[int]) -> tuple[dict[int, object | None], dict[int, list]]:
+    async def _get_core_users_map(
+        db: AsyncSession, core_ids: set[int]
+    ) -> tuple[dict[int, object | None], dict[int, list]]:
         if not core_ids:
             return {}, {}
 
@@ -629,12 +631,9 @@ async def _connect_single_node_local(self, db: AsyncSession, node_id: int) -> No
         core = cores_by_id.get(core_id)
         users = users_by_core.get(core_id, [])
 
-        # Calculate max_message_size based on this node's payload size
-        max_message_size = calculate_max_message_size(len(users))
-
         # Update node manager
         try:
-            await node_manager.update_node(db_node, max_message_size=max_message_size)
+            await node_manager.update_node(db_node)
         except NodeAPIError as e:
             # Update status to error using simple CRUD
             await update_node_status(

dashboard/src/service/api/index.ts

@@ -3486,7 +3486,7 @@ export const useRemoveAdminById = <TData = Awaited<ReturnType<typeof removeAdmin
  * @summary Get Admins
  */
 export const getAdmins = (adminSortOption: BodyType<AdminSortOption[]>, params?: GetAdminsParams, signal?: AbortSignal) => {
-  return orvalFetcher<AdminsResponse>({ url: `/api/admins`, method: 'GET', headers: { 'Content-Type': 'application/json' }, params, signal })
+  return orvalFetcher<AdminsResponse>({ url: `/api/admins`, method: 'GET', headers: { 'Content-Type': 'application/json' }, data: adminSortOption, params, signal })
 }
 
 export const getGetAdminsQueryKey = (adminSortOption: AdminSortOption[], params?: GetAdminsParams) => {
@@ -10033,7 +10033,7 @@ export function useGetUserSubUpdateListById<TData = Awaited<ReturnType<typeof ge
  * @summary Get Users
  */
 export const getUsers = (getUsersBody: BodyType<GetUsersBody>, params?: GetUsersParams, signal?: AbortSignal) => {
-  return orvalFetcher<UsersResponse>({ url: `/api/users`, method: 'GET', headers: { 'Content-Type': 'application/json' }, params, signal })
+  return orvalFetcher<UsersResponse>({ url: `/api/users`, method: 'GET', headers: { 'Content-Type': 'application/json' }, data: getUsersBody, params, signal })
 }
 
 export const getGetUsersQueryKey = (getUsersBody: GetUsersBody, params?: GetUsersParams) => {

dashboard/src/service/http.ts

@@ -39,6 +39,28 @@ type OvalFetcherParams = FetchOptions<'json'> & {
   data?: FetchOptions<'json'>['body']
 }
 export const orvalFetcher = async <T>({ url, method, params, data: body }: OvalFetcherParams): Promise<T> => {
+  if (method === 'GET') {
+    // 1. If we have data in a GET request, it means arguments were shifted or
+    // we manually passed data to rescue dropped parameters.
+    if (body && typeof body === 'object' && !Array.isArray(body)) {
+      params = { ...params, ...(body as Record<string, unknown>) }
+      body = undefined
+    } else if (body) {
+      // If it's not an object (e.g. just a string or array), we can't easily merge it
+      // unless we know the key. But for the known cases (status), it's usually an object
+      // when passed from the frontend filters.
+    }
+
+    // 2. If 'query' is present in params, check if it looks like React Query options.
+    if (params && 'query' in params) {
+      const queryVal = (params as any).query
+      if (queryVal && typeof queryVal === 'object' && ('staleTime' in queryVal || 'gcTime' in queryVal || 'retry' in queryVal)) {
+        const { query: _query, ...rest } = params as any
+        params = rest
+      }
+    }
+  }
+
   return fetcher(url, {
     method,
     params,