From 3a9007b2d41aeee98c3df542b618386b0e07a504 Mon Sep 17 00:00:00 2001 From: brendanlaschke Date: Mon, 5 Feb 2024 15:02:57 +0100 Subject: [PATCH] Member card fix email display (#3555) * member card fix email display * lint * on signup save userEmail --- .../src/modules/auth/states/currentWorkspaceMemberState.ts | 2 +- .../src/modules/auth/utils/getOnboardingStatus.ts | 2 +- .../modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx | 2 +- .../src/modules/workspace-member/types/WorkspaceMember.ts | 1 + .../src/modules/workspace/components/WorkspaceMemberCard.tsx | 4 +--- packages/twenty-front/src/testing/mock-data/activities.ts | 1 + packages/twenty-front/src/testing/mock-data/companies.ts | 1 + packages/twenty-front/src/testing/mock-data/users.ts | 1 + packages/twenty-server/src/core/user/services/user.service.ts | 4 ++-- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts index 6cdf64737e..938e304a6f 100644 --- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts +++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceMemberState.ts @@ -4,7 +4,7 @@ import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember'; export const currentWorkspaceMemberState = atom | null>({ key: 'currentWorkspaceMemberState', default: null, diff --git a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts index 4d8f533ef0..e99e0cc7b0 100644 --- a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts +++ b/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; diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx b/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx index 7a755eca83..f84692bfad 100644 --- a/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx +++ b/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: { diff --git a/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts b/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts index af7cd775a5..4f8b8adcad 100644 --- a/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts +++ b/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; }; diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceMemberCard.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceMemberCard.tsx index c6529442a6..e67e49bd86 100644 --- a/packages/twenty-front/src/modules/workspace/components/WorkspaceMemberCard.tsx +++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceMemberCard.tsx @@ -51,9 +51,7 @@ export const WorkspaceMemberCard = ({ workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName } /> - - {workspaceMember.name.firstName + ' ' + workspaceMember.name.lastName} - + {workspaceMember.userEmail} {accessory} diff --git a/packages/twenty-front/src/testing/mock-data/activities.ts b/packages/twenty-front/src/testing/mock-data/activities.ts index f929922dfa..db6a7670db 100644 --- a/packages/twenty-front/src/testing/mock-data/activities.ts +++ b/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', }; diff --git a/packages/twenty-front/src/testing/mock-data/companies.ts b/packages/twenty-front/src/testing/mock-data/companies.ts index d5a96d4c71..52dfaa4615 100644 --- a/packages/twenty-front/src/testing/mock-data/companies.ts +++ b/packages/twenty-front/src/testing/mock-data/companies.ts @@ -42,6 +42,7 @@ export const mockedCompaniesData: Array = [ 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', }, }, { diff --git a/packages/twenty-front/src/testing/mock-data/users.ts b/packages/twenty-front/src/testing/mock-data/users.ts index 42833e29df..712dd693c2 100644 --- a/packages/twenty-front/src/testing/mock-data/users.ts +++ b/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 = [ diff --git a/packages/twenty-server/src/core/user/services/user.service.ts b/packages/twenty-server/src/core/user/services/user.service.ts index 39b816d5b8..ad23e938d7 100644 --- a/packages/twenty-server/src/core/user/services/user.service.ts +++ b/packages/twenty-server/src/core/user/services/user.service.ts @@ -74,10 +74,10 @@ export class UserService extends TypeOrmQueryService { 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 ?? ''}')`, ); }