From d2ad23d1cf4c9158df6ea57df4995731cec06339 Mon Sep 17 00:00:00 2001
From: Etienne <45695613+etiennejouan@users.noreply.github.com>
Date: Mon, 3 Mar 2025 11:57:07 +0100
Subject: [PATCH] fix workspace member search (#10613)

---
 .../src/modules/command-menu/hooks/useSearchRecords.tsx       | 2 +-
 .../global-search/services/global-search.service.ts           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useSearchRecords.tsx b/packages/twenty-front/src/modules/command-menu/hooks/useSearchRecords.tsx
index 5bade7513..f9f403e55 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useSearchRecords.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useSearchRecords.tsx
@@ -20,7 +20,7 @@ export const useSearchRecords = () => {
     variables: {
       searchInput: deferredCommandMenuSearch ?? '',
       limit: MAX_SEARCH_RESULTS,
-      excludedObjectNameSingulars: [],
+      excludedObjectNameSingulars: ['workspaceMember'],
     },
   });
 
diff --git a/packages/twenty-server/src/engine/core-modules/global-search/services/global-search.service.ts b/packages/twenty-server/src/engine/core-modules/global-search/services/global-search.service.ts
index 289c0391b..18e36bcf1 100644
--- a/packages/twenty-server/src/engine/core-modules/global-search/services/global-search.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/global-search/services/global-search.service.ts
@@ -1,5 +1,5 @@
 import { Entity } from '@microsoft/microsoft-graph-types';
-import { getLogoUrlFromDomainName } from 'twenty-shared';
+import { FieldMetadataType, getLogoUrlFromDomainName } from 'twenty-shared';
 import { Brackets } from 'typeorm';
 
 import { ObjectRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
@@ -109,7 +109,7 @@ export class GlobalSearchService {
         objectMetadataItem.labelIdentifierFieldMetadataId
       ];
 
-    if (objectMetadataItem.nameSingular === 'person') {
+    if (labelIdentifierField.type === FieldMetadataType.FULL_NAME) {
       return [
         `${labelIdentifierField.name}FirstName`,
         `${labelIdentifierField.name}LastName`,