Member card fix email display (#3555)

* member card fix email display

* lint

* on signup save userEmail

packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts

@@ -4,7 +4,7 @@ import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
 
 export const currentWorkspaceMemberState = atom<Omit<
   WorkspaceMember,
-  'createdAt' | 'updatedAt' | 'userId'
+  'createdAt' | 'updatedAt' | 'userId' | 'userEmail'
 > | null>({
   key: 'currentWorkspaceMemberState',
   default: null,

packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts

@@ -19,7 +19,7 @@ export const getOnboardingStatus = ({
   isLoggedIn: boolean;
   currentWorkspaceMember: Omit<
     WorkspaceMember,
-    'createdAt' | 'updatedAt' | 'userId'
+    'createdAt' | 'updatedAt' | 'userId' | 'userEmail'
   > | null;
   currentWorkspace: CurrentWorkspace | null;
   isBillingEnabled?: boolean;

packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx

@@ -15,7 +15,7 @@ jest.mock('@/object-record/hooks/useUpdateOneRecord', () => ({
 
 const workspaceMember: Omit<
   WorkspaceMember,
-  'createdAt' | 'updatedAt' | 'userId'
+  'createdAt' | 'updatedAt' | 'userId' | 'userEmail'
 > = {
   id: 'id',
   name: {

packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts

@@ -11,5 +11,6 @@ export type WorkspaceMember = {
   colorScheme?: ColorScheme;
   createdAt: string;
   updatedAt: string;
+  userEmail: string;
   userId: string;
 };

packages/twenty-front/src/modules/workspace/components/WorkspaceMemberCard.tsx

@@ -51,9 +51,7 @@ export const WorkspaceMemberCard = ({
           workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName
         }
       />
-      <StyledEmailText>
+      <StyledEmailText>{workspaceMember.userEmail}</StyledEmailText>
-        {workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName}
-      </StyledEmailText>
     </StyledContent>
 
     {accessory}

packages/twenty-front/src/testing/mock-data/activities.ts

@@ -53,6 +53,7 @@ const workspaceMember: WorkspaceMember = {
   createdAt: '2023-04-26T10:23:42.33625+00:00',
   updatedAt: '2023-04-26T10:23:42.33625+00:00',
   userId: 'e2409670-1088-46b4-858e-f20a598d9d0f',
+  userEmail: 'charles@test.com',
   colorScheme: 'Light',
 };
 

packages/twenty-front/src/testing/mock-data/companies.ts

@@ -42,6 +42,7 @@ export const mockedCompaniesData: Array<MockedCompany> = [
       updatedAt: '2023-04-26T10:23:42.33625+00:00',
       createdAt: '2023-04-26T10:23:42.33625+00:00',
       userId: mockedUsersData[0].id,
+      userEmail: 'charles@test.com',
     },
   },
   {

packages/twenty-front/src/testing/mock-data/users.ts

@@ -46,6 +46,7 @@ const workspaceMember: WorkspaceMember = {
   createdAt: '2023-04-26T10:23:42.33625+00:00',
   updatedAt: '2023-04-26T10:23:42.33625+00:00',
   userId: '2603c1f9-0172-4ea6-986c-eeaccdf7f4cf',
+  userEmail: 'charles@test.com',
 };
 
 export const mockedUsersData: Array<MockedUser> = [

packages/twenty-server/src/core/user/services/user.service.ts

@@ -74,10 +74,10 @@ export class UserService extends TypeOrmQueryService<User> {
 
     await workspaceDataSource?.query(
       `INSERT INTO ${dataSourceMetadata.schema}."workspaceMember"
-      ("nameFirstName", "nameLastName", "colorScheme", "userId", "avatarUrl")
+      ("nameFirstName", "nameLastName", "colorScheme", "userId", "userEmail", "avatarUrl")
       VALUES ('${user.firstName}', '${user.lastName}', 'Light', '${
         user.id
-      }', '${avatarUrl ?? ''}')`,
+      }', '${user.email}', '${avatarUrl ?? ''}')`,
     );
   }