improve: getInviteSuggestionsConfig return

Author: LemonardoD

backend/src/modules/general/index.ts

@@ -232,7 +232,7 @@ const generalRoutes = app
     const memberships = getMemberships();
     // Retrieve organizationIds
     const organizationIds = memberships.filter((el) => el.type === 'organization').map((el) => String(el.organizationId));
-    if (!organizationIds.length) return ctx.json({ success: true, data: { items: [], total: 0 } }, 200);
+    if (!organizationIds.length) return ctx.json({ success: true, data: [] }, 200);
 
     // Build search filters
     const $or = [];
@@ -244,20 +244,20 @@ const generalRoutes = app
 
     const entityIdField = entityIdFields[entityType];
 
+    // Retrieve current entity members
     const currentEntityMembers = await db
       .select({ userId: membershipsTable.userId })
       .from(membershipsTable)
       .where(eq(membershipsTable[entityIdField], entityId));
 
-    const items = await db
+    const data = await db
       .selectDistinctOn([usersTable.id], {
         id: usersTable.id,
         slug: usersTable.slug,
         name: usersTable.name,
         entity: usersTable.entity,
         email: usersTable.email,
         thumbnailUrl: usersTable.thumbnailUrl,
-        membership: membershipSelect,
       })
       .from(usersTable)
       .innerJoin(
@@ -275,7 +275,7 @@ const generalRoutes = app
       .where(and(or(...$or), ne(usersTable.id, user.id)))
       .limit(10);
 
-    return ctx.json({ success: true, data: { items, total: items.length } }, 200);
+    return ctx.json({ success: true, data }, 200);
   })
   /*
    * Unsubscribe a user by token

backend/src/modules/general/routes.ts

@@ -5,7 +5,7 @@ import { tokenLimiter } from '#/middlewares/rate-limiter';
 import { errorResponses, successWithDataSchema, successWithoutDataSchema } from '#/utils/schema/common-responses';
 import { contextEntityTypeSchema, idSchema, pageEntityTypeSchema, slugSchema } from '#/utils/schema/common-schemas';
 import { userUnsubscribeQuerySchema } from '../users/schema';
-import { inviteBodySchema, suggestionsSchema } from './schema';
+import { entitySuggestionSchema, inviteBodySchema, suggestionsSchema } from './schema';
 
 class GeneralRoutesConfig {
   public unsubscribeUser = createRouteConfig({
@@ -183,10 +183,15 @@ class GeneralRoutesConfig {
     },
     responses: {
       200: {
-        description: 'Suggestions',
+        description: 'Invite Suggestions',
         content: {
           'application/json': {
-            schema: successWithDataSchema(suggestionsSchema),
+            schema: successWithDataSchema(
+              entitySuggestionSchema
+                .omit({ membership: true, email: true, thumbnailUrl: true })
+                .extend({ email: z.string(), thumbnailUrl: z.string().nullable() })
+                .array(),
+            ),
           },
         },
       },

frontend/src/modules/common/query-combobox.tsx

@@ -114,7 +114,7 @@ export function UserSearchCombobox({ value, onChange, entityId, entityType }: Us
           )}
           <CommandList className="px-1 h-full">
             {!isLoading &&
-              !data?.items.length &&
+              !data.length &&
               (debouncedSearchQuery.length ? (
                 <CommandEmpty className="h-full">
                   <ContentPlaceholder Icon={Search} title={t('common:no_resource_found', { resource: t('common:users').toLowerCase() })} />
@@ -125,10 +125,10 @@ export function UserSearchCombobox({ value, onChange, entityId, entityType }: Us
                 </CommandEmpty>
               ))}
 
-            {data && data.items?.length > 0 && (
+            {data && data.length > 0 && (
               <ScrollArea className="max-h-[30vh] overflow-y-auto">
                 <CommandGroup>
-                  {data.items.map((user) => (
+                  {data.map((user) => (
                     <CommandItem
                       data-was-selected={selected.some((u) => u === user.email)}
                       key={user.id}

frontend/src/modules/general/query.ts

@@ -30,6 +30,6 @@ export const inviteSuggestionsQueryOptions = (queryInfo: InviteSuggestionsProps)
     queryFn: () => getInviteSuggestions(queryInfo),
     staleTime: 0,
     enabled: searchQuery.trim().length > 0, // to avoid issues with spaces
-    initialData: { items: [], total: 0 },
+    initialData: [],
   });
 };