IR-3700: Added search by sso/email in user table (#10929)

* chore: Update search functionality in UserTable component * Added persistQuery in hook * Optimized query --------- Co-authored-by: Hanzla Mateen <[email protected]>
EtherealEngine · Aug 13, 2024 · d89646f · d89646f
1 parent 5755786
commit d89646f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/packages/client-core/src/admin/components/user/UserTable.tsx b/packages/client-core/src/admin/components/user/UserTable.tsx
@@ -87,18 +87,7 @@ export default function UserTable({
   useSearch(
     adminUserQuery,
     {
-      $or: [
-        {
-          id: {
-            $like: `%${search}%`
-          }
-        },
-        {
-          name: {
-            $like: `%${search}%`
-          }
-        }
-      ]
+      search
     },
     search
   )

diff --git a/packages/common/src/schemas/user/identity-provider.schema.ts b/packages/common/src/schemas/user/identity-provider.schema.ts
@@ -106,6 +106,9 @@ export const identityProviderQuerySchema = Type.Intersect(
     querySyntax(identityProviderQueryProperties, {
       accountIdentifier: {
         $like: Type.String()
+      },
+      email: {
+        $like: Type.String()
       }
     }),
     // Add additional query properties here

diff --git a/packages/server-core/src/user/user/user.hooks.ts b/packages/server-core/src/user/user/user.hooks.ts
@@ -284,9 +284,19 @@ const handleUserSearch = async (context: HookContext<UserService>) => {
 
     const searchedIdentityProviders = (await context.app.service(identityProviderPath).find({
       query: {
-        accountIdentifier: {
-          $like: `%${search}%`
-        }
+        $select: ['id', 'userId'],
+        $or: [
+          {
+            accountIdentifier: {
+              $like: `%${search}%`
+            }
+          },
+          {
+            email: {
+              $like: `%${search}%`
+            }
+          }
+        ]
       },
       paginate: false
     })) as IdentityProviderType[]