From 4263acbdc4259223e3fc9c0cc1b404bf38a053cb Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 17 Apr 2024 12:36:09 +0530
Subject: [PATCH] fix(nc-gui): allow user to search members by email as well as
 username (#8289)

* fix(nc-gui): allow user to search members by email as well as username

* fix(nocodb): oss allow user to search members by email as well as username
---
 packages/nc-gui/components/project/AccessSettings.vue      | 6 ++++--
 packages/nc-gui/components/workspace/CollaboratorsList.vue | 6 ++++--
 packages/nocodb/src/models/User.ts                         | 4 +---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 6c5b16f420..9dc1e12240 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -43,8 +43,10 @@ const isSearching = ref(false)
 const accessibleRoles = ref<(typeof ProjectRoles)[keyof typeof ProjectRoles][]>([])
 
 const filteredCollaborators = computed(() =>
-  collaborators.value.filter((collab) =>
-    (collab.display_name || collab.email).toLowerCase().includes(userSearchText.value.toLowerCase()),
+  collaborators.value.filter(
+    (collab) =>
+      collab.display_name?.toLowerCase()?.includes(userSearchText.value.toLowerCase()) ||
+      collab.email.toLowerCase().includes(userSearchText.value.toLowerCase()),
   ),
 )
 
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index cdd342a7b9..7362d977a4 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -19,8 +19,10 @@ const filterCollaborators = computed(() => {
 
   if (!collaborators.value) return []
 
-  return collaborators.value.filter((collab) =>
-    (collab.display_name || collab.email).toLowerCase().includes(userSearchText.value.toLowerCase()),
+  return collaborators.value.filter(
+    (collab) =>
+      collab.display_name.toLowerCase().includes(userSearchText.value.toLowerCase()) ||
+      collab.email.toLowerCase().includes(userSearchText.value.toLowerCase()),
   )
 })
 
diff --git a/packages/nocodb/src/models/User.ts b/packages/nocodb/src/models/User.ts
index 447d7fed11..348c6db438 100644
--- a/packages/nocodb/src/models/User.ts
+++ b/packages/nocodb/src/models/User.ts
@@ -243,9 +243,7 @@ export default class User implements UserType {
             .andWhereNot('display_name', '')
             .andWhere('display_name', 'like', `%${query.toLowerCase()}%`);
         }).orWhere(function () {
-          this.where(function () {
-            this.whereNull('display_name').orWhere('display_name', '');
-          }).andWhere('email', 'like', `%${query.toLowerCase()}%`);
+          this.where('email', 'like', `%${query.toLowerCase()}%`);
         });
       });
     }