Skip to content

The open alternative to Salesforce, designed for AI.

Show workspace members by name or email through one helper (#27791)

Félix Malfaitbff39dc5ffe0
diff --git a/packages/twenty-front/src/modules/object-record/record-sharing/utils/getRecordShareLabel.ts b/packages/twenty-front/src/modules/object-record/record-sharing/utils/getRecordShareLabel.ts
index 19d46969704..4cc244685fa 100644
--- a/packages/twenty-front/src/modules/object-record/record-sharing/utils/getRecordShareLabel.ts
+++ b/packages/twenty-front/src/modules/object-record/record-sharing/utils/getRecordShareLabel.ts
@@ -1,5 +1,6 @@
import { type CurrentWorkspaceMember } from '@/auth/states/currentWorkspaceMemberState';
import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
+import { getWorkspaceMemberNameOrEmail } from '@/workspace-member/utils/getWorkspaceMemberNameOrEmail';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
import {
@@ -28,10 +29,7 @@ export const getRecordShareLabel = ({
}
if (isDefined(member)) {
- return (
- `${member.name.firstName} ${member.name.lastName}`.trim() ||
- member.userEmail
- );
+ return getWorkspaceMemberNameOrEmail(member);
}
return t`Deleted member`;
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useUsageLimitSpenderOptions.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useUsageLimitSpenderOptions.ts
index 4e8e6f1436a..16756d027d9 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useUsageLimitSpenderOptions.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useUsageLimitSpenderOptions.ts
@@ -4,6 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';
import { type UsageLimitSpenderType } from '@/settings/billing/types/UsageLimitSpenderType';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { getWorkspaceMemberNameOrEmail } from '@/workspace-member/utils/getWorkspaceMemberNameOrEmail';
import {
FindManyAgentsDocument,
FindManyApplicationsDocument,
@@ -57,9 +58,7 @@ export const useUsageLimitSpenderOptions = (
? [
{
id: member.userWorkspaceId,
- label:
- `${member.name.firstName} ${member.name.lastName}`.trim() ||
- member.userEmail,
+ label: getWorkspaceMemberNameOrEmail(member),
avatarUrl: member.avatarUrl,
},
]
diff --git a/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordAddPeopleItem.tsx b/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordAddPeopleItem.tsx
index 9d23ef649c7..24bb37758ee 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordAddPeopleItem.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/share-record/components/SidePanelShareRecordAddPeopleItem.tsx
@@ -9,6 +9,7 @@ import { RecordSharingAccessSelect } from '@/object-record/record-sharing/compon
import { type useRecordSharing } from '@/object-record/record-sharing/hooks/useRecordSharing';
import { SidePanelShareRecordDropdownItem } from '@/side-panel/pages/share-record/components/SidePanelShareRecordDropdownItem';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { getWorkspaceMemberNameOrEmail } from '@/workspace-member/utils/getWorkspaceMemberNameOrEmail';
import { RecordShareAccessLevel } from '~/generated-metadata/graphql';
const StyledRecipients = styled.div`
@@ -95,8 +96,7 @@ export const SidePanelShareRecordAddPeopleItem = ({
});
}}
>
- {`${member.name.firstName} ${member.name.lastName}`.trim() ||
- member.userEmail}
+ {getWorkspaceMemberNameOrEmail(member)}
</Dropdown.ActionItem>
))}
{availableRoles.map((role) => (