admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implement scoping on be (#144)

Browse Source
This commit is contained in:
Charles Bochet
2023-05-26 14:00:32 +02:00
committed by GitHub
parent f79a45e7e6
commit 26d3716ae7
981 changed files with 14545 additions and 24213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/__stories__/App.stories.tsx
View File

@ -12,7 +12,7 @@ const component = {
localStorage.setItem('refreshToken', 'xxx-refresh');
localStorage.setItem(
'accessToken',
'eyJhbGciOiJIUzI1NiJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLXdvcmtzcGFjZS1pZCI6IjdlZDlkMjEyLTFjMjUtNGQwMi1iZjI1LTZhZWNjZjdlYTQxOSIsIngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibWUiLCJ1c2VyIl0sIngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS11c2VyLWlkIjoiMTY1MDZiYTgtMTk2Yy00YzEzLWE0YTctYTIyY2I1ZWNjZmExIiwieC1oYXN1cmEtdXNlci1pcy1hbm9ueW1vdXMiOiJmYWxzZSJ9LCJzdWIiOiIxNjUwNmJhOC0xOTZjLTRjMTMtYTRhNy1hMjJjYjVlY2NmYTEiLCJpYXQiOjE2ODM4NzM5NzIsImV4cCI6MTY4Mzg3NDg3MiwiaXNzIjoiaGFzdXJhLWF1dGgifQ.C_OynseOprgU-SdLBLzMdfg_441eopI7LYg8yB86g3c',
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJiNzU5MGRiOS1hYzdkLTQyNzUtOWM2Yy0zMjM5NzkxOTI3OTUiLCJ3b3Jrc3BhY2VJZCI6IjdlZDlkMjEyLTFjMjUtNGQwMi1iZjI1LTZhZWNjZjdlYTQxOSIsImlhdCI6MTY4NTA5MzE3MiwiZXhwIjoxNjg1MDkzNDcyfQ.0g-z2vKBbGGcs0EmZ3Q7HpZ9Yno_SOrprhcQMm1Zb6Y',
);
const mocks = [
@ -20,14 +20,14 @@ const mocks = [
request: {
query: GET_CURRENT_USER,
variables: {
uuid: '16506ba8-196c-4c13-a4a7-a22cb5eccfa1',
uuid: 'b7590db9-ac7d-4275-9c6c-323979192795',
},
},
result: {
data: {
users: [
{
id: '16506ba8-196c-4c13-a4a7-a22cb5eccfa1',
id: 'b7590db9-ac7d-4275-9c6c-323979192795',
email: 'charles@twenty.com',
displayName: 'Charles Bochet',
workspace_member: {

3
front/src/apollo.tsx
View File

@ -28,8 +28,7 @@ const errorLink = onError(({ graphQLErrors, operation, forward }) => {
if (graphQLErrors) {
for (const err of graphQLErrors) {
switch (err.extensions.code) {
case 'invalid-jwt':
case 'not-found':
case 'UNAUTHENTICATED':
return new Observable((observer) => {
(async () => {
try {

5
front/src/components/editable-cell/EditableCell.tsx
View File

@ -69,8 +69,7 @@ export function EditableCell({
onInsideClick && onInsideClick();
}}
>
<CellNormalModeContainer>{nonEditModeContent}</CellNormalModeContainer>
{isEditMode && (
{isEditMode ? (
<CellEditModeContainer
ref={editableContainerRef}
editModeHorizontalAlign={editModeHorizontalAlign}
@ -78,6 +77,8 @@ export function EditableCell({
>
{editModeContent}
</CellEditModeContainer>
) : (
<CellNormalModeContainer>{nonEditModeContent}</CellNormalModeContainer>
)}
</CellBaseContainer>
);

6
front/src/components/editable-cell/__tests__/EditableFullName.test.tsx
View File

@ -5,11 +5,7 @@ import { EditableFullNameStory } from '../__stories__/EditableFullName.stories';
it('Checks the EditableFullName editing event bubbles up', async () => {
const func = jest.fn(() => null);
const { getByTestId } = render(
<EditableFullNameStory
firstname="Jone"
lastname="Doe"
changeHandler={func}
/>,
<EditableFullNameStory firstname="Jone" lastname="Doe" onChange={func} />,
);
const parent = getByTestId('content-editable-parent');

2
front/src/components/people/EditablePeopleFullName.tsx
View File

@ -23,7 +23,7 @@ export function EditablePeopleFullName({
setFirstnameValue(firstValue);
setLastnameValue(secondValue);
onChange(firstnameValue, lastnameValue);
onChange(firstValue, secondValue);
}
return (

410
front/src/generated/graphql.tsx
View File

@ -17,8 +17,8 @@ export type Scalars = {
JSON: any;
};
export type AffectedRowsOutput = {
__typename?: 'AffectedRowsOutput';
export type AffectedRows = {
__typename?: 'AffectedRows';
count: Scalars['Int'];
};
@ -33,7 +33,7 @@ export type BoolFilter = {
export type Company = {
__typename?: 'Company';
_count?: Maybe<CompanyCount>;
_count: CompanyCount;
accountOwner?: Maybe<User>;
accountOwnerId?: Maybe<Scalars['String']>;
address: Scalars['String'];
@ -41,24 +41,14 @@ export type Company = {
deletedAt?: Maybe<Scalars['DateTime']>;
domainName: Scalars['String'];
employees?: Maybe<Scalars['Int']>;
id: Scalars['String'];
id: Scalars['ID'];
name: Scalars['String'];
people: Array<Person>;
people?: Maybe<Array<Person>>;
updatedAt: Scalars['DateTime'];
workspace: Workspace;
workspaceId: Scalars['String'];
};
export type CompanyPeopleArgs = {
cursor?: InputMaybe<PersonWhereUniqueInput>;
distinct?: InputMaybe<Array<PersonScalarFieldEnum>>;
orderBy?: InputMaybe<Array<PersonOrderByWithRelationInput>>;
skip?: InputMaybe<Scalars['Int']>;
take?: InputMaybe<Scalars['Int']>;
where?: InputMaybe<PersonWhereInput>;
};
export type CompanyCount = {
__typename?: 'CompanyCount';
people: Scalars['Int'];
@ -75,24 +65,6 @@ export type CompanyCreateInput = {
name: Scalars['String'];
people?: InputMaybe<PersonCreateNestedManyWithoutCompanyInput>;
updatedAt?: InputMaybe<Scalars['DateTime']>;
workspace: WorkspaceCreateNestedOneWithoutCompaniesInput;
};
export type CompanyCreateManyAccountOwnerInput = {
address: Scalars['String'];
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
domainName: Scalars['String'];
employees?: InputMaybe<Scalars['Int']>;
id: Scalars['String'];
name: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
workspaceId: Scalars['String'];
};
export type CompanyCreateManyAccountOwnerInputEnvelope = {
data: Array<CompanyCreateManyAccountOwnerInput>;
skipDuplicates?: InputMaybe<Scalars['Boolean']>;
};
export type CompanyCreateManyWorkspaceInput = {
@ -112,13 +84,6 @@ export type CompanyCreateManyWorkspaceInputEnvelope = {
skipDuplicates?: InputMaybe<Scalars['Boolean']>;
};
export type CompanyCreateNestedManyWithoutAccountOwnerInput = {
connect?: InputMaybe<Array<CompanyWhereUniqueInput>>;
connectOrCreate?: InputMaybe<Array<CompanyCreateOrConnectWithoutAccountOwnerInput>>;
create?: InputMaybe<Array<CompanyCreateWithoutAccountOwnerInput>>;
createMany?: InputMaybe<CompanyCreateManyAccountOwnerInputEnvelope>;
};
export type CompanyCreateNestedManyWithoutWorkspaceInput = {
connect?: InputMaybe<Array<CompanyWhereUniqueInput>>;
connectOrCreate?: InputMaybe<Array<CompanyCreateOrConnectWithoutWorkspaceInput>>;
@ -132,11 +97,6 @@ export type CompanyCreateNestedOneWithoutPeopleInput = {
create?: InputMaybe<CompanyCreateWithoutPeopleInput>;
};
export type CompanyCreateOrConnectWithoutAccountOwnerInput = {
create: CompanyCreateWithoutAccountOwnerInput;
where: CompanyWhereUniqueInput;
};
export type CompanyCreateOrConnectWithoutPeopleInput = {
create: CompanyCreateWithoutPeopleInput;
where: CompanyWhereUniqueInput;
@ -147,19 +107,6 @@ export type CompanyCreateOrConnectWithoutWorkspaceInput = {
where: CompanyWhereUniqueInput;
};
export type CompanyCreateWithoutAccountOwnerInput = {
address: Scalars['String'];
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
domainName: Scalars['String'];
employees?: InputMaybe<Scalars['Int']>;
id: Scalars['String'];
name: Scalars['String'];
people?: InputMaybe<PersonCreateNestedManyWithoutCompanyInput>;
updatedAt?: InputMaybe<Scalars['DateTime']>;
workspace: WorkspaceCreateNestedOneWithoutCompaniesInput;
};
export type CompanyCreateWithoutPeopleInput = {
accountOwner?: InputMaybe<UserCreateNestedOneWithoutCompaniesInput>;
address: Scalars['String'];
@ -170,7 +117,6 @@ export type CompanyCreateWithoutPeopleInput = {
id: Scalars['String'];
name: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
workspace: WorkspaceCreateNestedOneWithoutCompaniesInput;
};
export type CompanyCreateWithoutWorkspaceInput = {
@ -208,8 +154,6 @@ export type CompanyOrderByWithRelationInput = {
name?: InputMaybe<SortOrder>;
people?: InputMaybe<PersonOrderByRelationAggregateInput>;
updatedAt?: InputMaybe<SortOrder>;
workspace?: InputMaybe<WorkspaceOrderByWithRelationInput>;
workspaceId?: InputMaybe<SortOrder>;
};
export type CompanyRelationFilter = {
@ -243,7 +187,6 @@ export type CompanyScalarWhereInput = {
id?: InputMaybe<StringFilter>;
name?: InputMaybe<StringFilter>;
updatedAt?: InputMaybe<DateTimeFilter>;
workspaceId?: InputMaybe<StringFilter>;
};
export type CompanyUpdateInput = {
@ -257,7 +200,6 @@ export type CompanyUpdateInput = {
name?: InputMaybe<StringFieldUpdateOperationsInput>;
people?: InputMaybe<PersonUpdateManyWithoutCompanyNestedInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
workspace?: InputMaybe<WorkspaceUpdateOneRequiredWithoutCompaniesNestedInput>;
};
export type CompanyUpdateManyMutationInput = {
@ -271,30 +213,11 @@ export type CompanyUpdateManyMutationInput = {
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type CompanyUpdateManyWithWhereWithoutAccountOwnerInput = {
data: CompanyUpdateManyMutationInput;
where: CompanyScalarWhereInput;
};
export type CompanyUpdateManyWithWhereWithoutWorkspaceInput = {
data: CompanyUpdateManyMutationInput;
where: CompanyScalarWhereInput;
};
export type CompanyUpdateManyWithoutAccountOwnerNestedInput = {
connect?: InputMaybe<Array<CompanyWhereUniqueInput>>;
connectOrCreate?: InputMaybe<Array<CompanyCreateOrConnectWithoutAccountOwnerInput>>;
create?: InputMaybe<Array<CompanyCreateWithoutAccountOwnerInput>>;
createMany?: InputMaybe<CompanyCreateManyAccountOwnerInputEnvelope>;
delete?: InputMaybe<Array<CompanyWhereUniqueInput>>;
deleteMany?: InputMaybe<Array<CompanyScalarWhereInput>>;
disconnect?: InputMaybe<Array<CompanyWhereUniqueInput>>;
set?: InputMaybe<Array<CompanyWhereUniqueInput>>;
update?: InputMaybe<Array<CompanyUpdateWithWhereUniqueWithoutAccountOwnerInput>>;
updateMany?: InputMaybe<Array<CompanyUpdateManyWithWhereWithoutAccountOwnerInput>>;
upsert?: InputMaybe<Array<CompanyUpsertWithWhereUniqueWithoutAccountOwnerInput>>;
};
export type CompanyUpdateManyWithoutWorkspaceNestedInput = {
connect?: InputMaybe<Array<CompanyWhereUniqueInput>>;
connectOrCreate?: InputMaybe<Array<CompanyCreateOrConnectWithoutWorkspaceInput>>;
@ -319,29 +242,11 @@ export type CompanyUpdateOneWithoutPeopleNestedInput = {
upsert?: InputMaybe<CompanyUpsertWithoutPeopleInput>;
};
export type CompanyUpdateWithWhereUniqueWithoutAccountOwnerInput = {
data: CompanyUpdateWithoutAccountOwnerInput;
where: CompanyWhereUniqueInput;
};
export type CompanyUpdateWithWhereUniqueWithoutWorkspaceInput = {
data: CompanyUpdateWithoutWorkspaceInput;
where: CompanyWhereUniqueInput;
};
export type CompanyUpdateWithoutAccountOwnerInput = {
address?: InputMaybe<StringFieldUpdateOperationsInput>;
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
deletedAt?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
domainName?: InputMaybe<StringFieldUpdateOperationsInput>;
employees?: InputMaybe<NullableIntFieldUpdateOperationsInput>;
id?: InputMaybe<StringFieldUpdateOperationsInput>;
name?: InputMaybe<StringFieldUpdateOperationsInput>;
people?: InputMaybe<PersonUpdateManyWithoutCompanyNestedInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
workspace?: InputMaybe<WorkspaceUpdateOneRequiredWithoutCompaniesNestedInput>;
};
export type CompanyUpdateWithoutPeopleInput = {
accountOwner?: InputMaybe<UserUpdateOneWithoutCompaniesNestedInput>;
address?: InputMaybe<StringFieldUpdateOperationsInput>;
@ -352,7 +257,6 @@ export type CompanyUpdateWithoutPeopleInput = {
id?: InputMaybe<StringFieldUpdateOperationsInput>;
name?: InputMaybe<StringFieldUpdateOperationsInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
workspace?: InputMaybe<WorkspaceUpdateOneRequiredWithoutCompaniesNestedInput>;
};
export type CompanyUpdateWithoutWorkspaceInput = {
@ -368,12 +272,6 @@ export type CompanyUpdateWithoutWorkspaceInput = {
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type CompanyUpsertWithWhereUniqueWithoutAccountOwnerInput = {
create: CompanyCreateWithoutAccountOwnerInput;
update: CompanyUpdateWithoutAccountOwnerInput;
where: CompanyWhereUniqueInput;
};
export type CompanyUpsertWithWhereUniqueWithoutWorkspaceInput = {
create: CompanyCreateWithoutWorkspaceInput;
update: CompanyUpdateWithoutWorkspaceInput;
@ -400,8 +298,6 @@ export type CompanyWhereInput = {
name?: InputMaybe<StringFilter>;
people?: InputMaybe<PersonListRelationFilter>;
updatedAt?: InputMaybe<DateTimeFilter>;
workspace?: InputMaybe<WorkspaceRelationFilter>;
workspaceId?: InputMaybe<StringFilter>;
};
export type CompanyWhereUniqueInput = {
@ -465,8 +361,8 @@ export type Mutation = {
__typename?: 'Mutation';
createOneCompany: Company;
createOnePerson: Person;
deleteManyCompany: AffectedRowsOutput;
deleteManyPerson: AffectedRowsOutput;
deleteManyCompany: AffectedRows;
deleteManyPerson: AffectedRows;
deleteOneCompany?: Maybe<Company>;
updateOneCompany?: Maybe<Company>;
updateOnePerson?: Maybe<Person>;
@ -600,7 +496,7 @@ export type Person = {
deletedAt?: Maybe<Scalars['DateTime']>;
email: Scalars['String'];
firstname: Scalars['String'];
id: Scalars['String'];
id: Scalars['ID'];
lastname: Scalars['String'];
phone: Scalars['String'];
updatedAt: Scalars['DateTime'];
@ -619,7 +515,6 @@ export type PersonCreateInput = {
lastname: Scalars['String'];
phone: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
workspace: WorkspaceCreateNestedOneWithoutPeopleInput;
};
export type PersonCreateManyCompanyInput = {
@ -632,7 +527,6 @@ export type PersonCreateManyCompanyInput = {
lastname: Scalars['String'];
phone: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
workspaceId: Scalars['String'];
};
export type PersonCreateManyCompanyInputEnvelope = {
@ -692,7 +586,6 @@ export type PersonCreateWithoutCompanyInput = {
lastname: Scalars['String'];
phone: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
workspace: WorkspaceCreateNestedOneWithoutPeopleInput;
};
export type PersonCreateWithoutWorkspaceInput = {
@ -730,8 +623,6 @@ export type PersonOrderByWithRelationInput = {
lastname?: InputMaybe<SortOrder>;
phone?: InputMaybe<SortOrder>;
updatedAt?: InputMaybe<SortOrder>;
workspace?: InputMaybe<WorkspaceOrderByWithRelationInput>;
workspaceId?: InputMaybe<SortOrder>;
};
export enum PersonScalarFieldEnum {
@ -762,7 +653,6 @@ export type PersonScalarWhereInput = {
lastname?: InputMaybe<StringFilter>;
phone?: InputMaybe<StringFilter>;
updatedAt?: InputMaybe<DateTimeFilter>;
workspaceId?: InputMaybe<StringFilter>;
};
export type PersonUpdateInput = {
@ -776,7 +666,6 @@ export type PersonUpdateInput = {
lastname?: InputMaybe<StringFieldUpdateOperationsInput>;
phone?: InputMaybe<StringFieldUpdateOperationsInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
workspace?: InputMaybe<WorkspaceUpdateOneRequiredWithoutPeopleNestedInput>;
};
export type PersonUpdateManyMutationInput = {
@ -849,7 +738,6 @@ export type PersonUpdateWithoutCompanyInput = {
lastname?: InputMaybe<StringFieldUpdateOperationsInput>;
phone?: InputMaybe<StringFieldUpdateOperationsInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
workspace?: InputMaybe<WorkspaceUpdateOneRequiredWithoutPeopleNestedInput>;
};
export type PersonUpdateWithoutWorkspaceInput = {
@ -892,8 +780,6 @@ export type PersonWhereInput = {
lastname?: InputMaybe<StringFilter>;
phone?: InputMaybe<StringFilter>;
updatedAt?: InputMaybe<DateTimeFilter>;
workspace?: InputMaybe<WorkspaceRelationFilter>;
workspaceId?: InputMaybe<StringFilter>;
};
export type PersonWhereUniqueInput = {
@ -904,6 +790,7 @@ export type Query = {
__typename?: 'Query';
companies: Array<Company>;
people: Array<Person>;
user: User;
users: Array<User>;
};
@ -928,6 +815,11 @@ export type QueryPeopleArgs = {
};
export type QueryUserArgs = {
where: UserWhereUniqueInput;
};
export type QueryUsersArgs = {
cursor?: InputMaybe<UserWhereUniqueInput>;
distinct?: InputMaybe<Array<UserScalarFieldEnum>>;
@ -946,9 +838,10 @@ export type RefreshToken = {
__typename?: 'RefreshToken';
createdAt: Scalars['DateTime'];
deletedAt?: Maybe<Scalars['DateTime']>;
id: Scalars['String'];
id: Scalars['ID'];
refreshToken: Scalars['String'];
updatedAt: Scalars['DateTime'];
user: User;
userId: Scalars['String'];
};
@ -1130,18 +1023,18 @@ export type StringNullableFilter = {
export type User = {
__typename?: 'User';
RefreshTokens: Array<RefreshToken>;
RefreshTokens?: Maybe<Array<RefreshToken>>;
WorkspaceMember?: Maybe<WorkspaceMember>;
_count?: Maybe<UserCount>;
_count: UserCount;
avatarUrl?: Maybe<Scalars['String']>;
companies: Array<Company>;
companies?: Maybe<Array<Company>>;
createdAt: Scalars['DateTime'];
deletedAt?: Maybe<Scalars['DateTime']>;
disabled: Scalars['Boolean'];
displayName: Scalars['String'];
email: Scalars['String'];
emailVerified: Scalars['Boolean'];
id: Scalars['String'];
id: Scalars['ID'];
lastSeen?: Maybe<Scalars['DateTime']>;
locale: Scalars['String'];
metadata?: Maybe<Scalars['JSON']>;
@ -1182,22 +1075,11 @@ export type UserCreateNestedOneWithoutCompaniesInput = {
create?: InputMaybe<UserCreateWithoutCompaniesInput>;
};
export type UserCreateNestedOneWithoutWorkspaceMemberInput = {
connect?: InputMaybe<UserWhereUniqueInput>;
connectOrCreate?: InputMaybe<UserCreateOrConnectWithoutWorkspaceMemberInput>;
create?: InputMaybe<UserCreateWithoutWorkspaceMemberInput>;
};
export type UserCreateOrConnectWithoutCompaniesInput = {
create: UserCreateWithoutCompaniesInput;
where: UserWhereUniqueInput;
};
export type UserCreateOrConnectWithoutWorkspaceMemberInput = {
create: UserCreateWithoutWorkspaceMemberInput;
where: UserWhereUniqueInput;
};
export type UserCreateWithoutCompaniesInput = {
RefreshTokens?: InputMaybe<RefreshTokenCreateNestedManyWithoutUserInput>;
WorkspaceMember?: InputMaybe<WorkspaceMemberCreateNestedOneWithoutUserInput>;
@ -1217,25 +1099,6 @@ export type UserCreateWithoutCompaniesInput = {
updatedAt?: InputMaybe<Scalars['DateTime']>;
};
export type UserCreateWithoutWorkspaceMemberInput = {
RefreshTokens?: InputMaybe<RefreshTokenCreateNestedManyWithoutUserInput>;
avatarUrl?: InputMaybe<Scalars['String']>;
companies?: InputMaybe<CompanyCreateNestedManyWithoutAccountOwnerInput>;
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
disabled?: InputMaybe<Scalars['Boolean']>;
displayName: Scalars['String'];
email: Scalars['String'];
emailVerified?: InputMaybe<Scalars['Boolean']>;
id: Scalars['String'];
lastSeen?: InputMaybe<Scalars['DateTime']>;
locale: Scalars['String'];
metadata?: InputMaybe<Scalars['JSON']>;
passwordHash?: InputMaybe<Scalars['String']>;
phoneNumber?: InputMaybe<Scalars['String']>;
updatedAt?: InputMaybe<Scalars['DateTime']>;
};
export type UserOrderByWithRelationInput = {
RefreshTokens?: InputMaybe<RefreshTokenOrderByRelationAggregateInput>;
WorkspaceMember?: InputMaybe<WorkspaceMemberOrderByWithRelationInput>;
@ -1278,14 +1141,6 @@ export enum UserScalarFieldEnum {
UpdatedAt = 'updatedAt'
}
export type UserUpdateOneRequiredWithoutWorkspaceMemberNestedInput = {
connect?: InputMaybe<UserWhereUniqueInput>;
connectOrCreate?: InputMaybe<UserCreateOrConnectWithoutWorkspaceMemberInput>;
create?: InputMaybe<UserCreateWithoutWorkspaceMemberInput>;
update?: InputMaybe<UserUpdateWithoutWorkspaceMemberInput>;
upsert?: InputMaybe<UserUpsertWithoutWorkspaceMemberInput>;
};
export type UserUpdateOneWithoutCompaniesNestedInput = {
connect?: InputMaybe<UserWhereUniqueInput>;
connectOrCreate?: InputMaybe<UserCreateOrConnectWithoutCompaniesInput>;
@ -1315,35 +1170,11 @@ export type UserUpdateWithoutCompaniesInput = {
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type UserUpdateWithoutWorkspaceMemberInput = {
RefreshTokens?: InputMaybe<RefreshTokenUpdateManyWithoutUserNestedInput>;
avatarUrl?: InputMaybe<NullableStringFieldUpdateOperationsInput>;
companies?: InputMaybe<CompanyUpdateManyWithoutAccountOwnerNestedInput>;
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
deletedAt?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
disabled?: InputMaybe<BoolFieldUpdateOperationsInput>;
displayName?: InputMaybe<StringFieldUpdateOperationsInput>;
email?: InputMaybe<StringFieldUpdateOperationsInput>;
emailVerified?: InputMaybe<BoolFieldUpdateOperationsInput>;
id?: InputMaybe<StringFieldUpdateOperationsInput>;
lastSeen?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
locale?: InputMaybe<StringFieldUpdateOperationsInput>;
metadata?: InputMaybe<Scalars['JSON']>;
passwordHash?: InputMaybe<NullableStringFieldUpdateOperationsInput>;
phoneNumber?: InputMaybe<NullableStringFieldUpdateOperationsInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type UserUpsertWithoutCompaniesInput = {
create: UserCreateWithoutCompaniesInput;
update: UserUpdateWithoutCompaniesInput;
};
export type UserUpsertWithoutWorkspaceMemberInput = {
create: UserCreateWithoutWorkspaceMemberInput;
update: UserUpdateWithoutWorkspaceMemberInput;
};
export type UserWhereInput = {
AND?: InputMaybe<Array<UserWhereInput>>;
NOT?: InputMaybe<Array<UserWhereInput>>;
@ -1374,12 +1205,15 @@ export type UserWhereUniqueInput = {
export type Workspace = {
__typename?: 'Workspace';
_count?: Maybe<WorkspaceCount>;
WorkspaceMember?: Maybe<Array<WorkspaceMember>>;
_count: WorkspaceCount;
companies?: Maybe<Array<Company>>;
createdAt: Scalars['DateTime'];
deletedAt?: Maybe<Scalars['DateTime']>;
displayName: Scalars['String'];
domainName: Scalars['String'];
id: Scalars['String'];
id: Scalars['ID'];
people?: Maybe<Array<Person>>;
updatedAt: Scalars['DateTime'];
};
@ -1390,61 +1224,17 @@ export type WorkspaceCount = {
people: Scalars['Int'];
};
export type WorkspaceCreateNestedOneWithoutCompaniesInput = {
connect?: InputMaybe<WorkspaceWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceCreateOrConnectWithoutCompaniesInput>;
create?: InputMaybe<WorkspaceCreateWithoutCompaniesInput>;
};
export type WorkspaceCreateNestedOneWithoutPeopleInput = {
connect?: InputMaybe<WorkspaceWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceCreateOrConnectWithoutPeopleInput>;
create?: InputMaybe<WorkspaceCreateWithoutPeopleInput>;
};
export type WorkspaceCreateNestedOneWithoutWorkspaceMemberInput = {
connect?: InputMaybe<WorkspaceWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceCreateOrConnectWithoutWorkspaceMemberInput>;
create?: InputMaybe<WorkspaceCreateWithoutWorkspaceMemberInput>;
};
export type WorkspaceCreateOrConnectWithoutCompaniesInput = {
create: WorkspaceCreateWithoutCompaniesInput;
where: WorkspaceWhereUniqueInput;
};
export type WorkspaceCreateOrConnectWithoutPeopleInput = {
create: WorkspaceCreateWithoutPeopleInput;
where: WorkspaceWhereUniqueInput;
};
export type WorkspaceCreateOrConnectWithoutWorkspaceMemberInput = {
create: WorkspaceCreateWithoutWorkspaceMemberInput;
where: WorkspaceWhereUniqueInput;
};
export type WorkspaceCreateWithoutCompaniesInput = {
WorkspaceMember?: InputMaybe<WorkspaceMemberCreateNestedManyWithoutWorkspaceInput>;
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
displayName: Scalars['String'];
domainName: Scalars['String'];
id: Scalars['String'];
people?: InputMaybe<PersonCreateNestedManyWithoutWorkspaceInput>;
updatedAt?: InputMaybe<Scalars['DateTime']>;
};
export type WorkspaceCreateWithoutPeopleInput = {
WorkspaceMember?: InputMaybe<WorkspaceMemberCreateNestedManyWithoutWorkspaceInput>;
companies?: InputMaybe<CompanyCreateNestedManyWithoutWorkspaceInput>;
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
displayName: Scalars['String'];
domainName: Scalars['String'];
id: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
};
export type WorkspaceCreateWithoutWorkspaceMemberInput = {
companies?: InputMaybe<CompanyCreateNestedManyWithoutWorkspaceInput>;
createdAt?: InputMaybe<Scalars['DateTime']>;
@ -1460,7 +1250,7 @@ export type WorkspaceMember = {
__typename?: 'WorkspaceMember';
createdAt: Scalars['DateTime'];
deletedAt?: Maybe<Scalars['DateTime']>;
id: Scalars['String'];
id: Scalars['ID'];
updatedAt: Scalars['DateTime'];
user: User;
userId: Scalars['String'];
@ -1468,26 +1258,6 @@ export type WorkspaceMember = {
workspaceId: Scalars['String'];
};
export type WorkspaceMemberCreateManyWorkspaceInput = {
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
id: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
userId: Scalars['String'];
};
export type WorkspaceMemberCreateManyWorkspaceInputEnvelope = {
data: Array<WorkspaceMemberCreateManyWorkspaceInput>;
skipDuplicates?: InputMaybe<Scalars['Boolean']>;
};
export type WorkspaceMemberCreateNestedManyWithoutWorkspaceInput = {
connect?: InputMaybe<Array<WorkspaceMemberWhereUniqueInput>>;
connectOrCreate?: InputMaybe<Array<WorkspaceMemberCreateOrConnectWithoutWorkspaceInput>>;
create?: InputMaybe<Array<WorkspaceMemberCreateWithoutWorkspaceInput>>;
createMany?: InputMaybe<WorkspaceMemberCreateManyWorkspaceInputEnvelope>;
};
export type WorkspaceMemberCreateNestedOneWithoutUserInput = {
connect?: InputMaybe<WorkspaceMemberWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceMemberCreateOrConnectWithoutUserInput>;
@ -1499,11 +1269,6 @@ export type WorkspaceMemberCreateOrConnectWithoutUserInput = {
where: WorkspaceMemberWhereUniqueInput;
};
export type WorkspaceMemberCreateOrConnectWithoutWorkspaceInput = {
create: WorkspaceMemberCreateWithoutWorkspaceInput;
where: WorkspaceMemberWhereUniqueInput;
};
export type WorkspaceMemberCreateWithoutUserInput = {
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
@ -1512,14 +1277,6 @@ export type WorkspaceMemberCreateWithoutUserInput = {
workspace: WorkspaceCreateNestedOneWithoutWorkspaceMemberInput;
};
export type WorkspaceMemberCreateWithoutWorkspaceInput = {
createdAt?: InputMaybe<Scalars['DateTime']>;
deletedAt?: InputMaybe<Scalars['DateTime']>;
id: Scalars['String'];
updatedAt?: InputMaybe<Scalars['DateTime']>;
user: UserCreateNestedOneWithoutWorkspaceMemberInput;
};
export type WorkspaceMemberListRelationFilter = {
every?: InputMaybe<WorkspaceMemberWhereInput>;
none?: InputMaybe<WorkspaceMemberWhereInput>;
@ -1546,44 +1303,6 @@ export type WorkspaceMemberRelationFilter = {
isNot?: InputMaybe<WorkspaceMemberWhereInput>;
};
export type WorkspaceMemberScalarWhereInput = {
AND?: InputMaybe<Array<WorkspaceMemberScalarWhereInput>>;
NOT?: InputMaybe<Array<WorkspaceMemberScalarWhereInput>>;
OR?: InputMaybe<Array<WorkspaceMemberScalarWhereInput>>;
createdAt?: InputMaybe<DateTimeFilter>;
deletedAt?: InputMaybe<DateTimeNullableFilter>;
id?: InputMaybe<StringFilter>;
updatedAt?: InputMaybe<DateTimeFilter>;
userId?: InputMaybe<StringFilter>;
workspaceId?: InputMaybe<StringFilter>;
};
export type WorkspaceMemberUpdateManyMutationInput = {
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
deletedAt?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
id?: InputMaybe<StringFieldUpdateOperationsInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type WorkspaceMemberUpdateManyWithWhereWithoutWorkspaceInput = {
data: WorkspaceMemberUpdateManyMutationInput;
where: WorkspaceMemberScalarWhereInput;
};
export type WorkspaceMemberUpdateManyWithoutWorkspaceNestedInput = {
connect?: InputMaybe<Array<WorkspaceMemberWhereUniqueInput>>;
connectOrCreate?: InputMaybe<Array<WorkspaceMemberCreateOrConnectWithoutWorkspaceInput>>;
create?: InputMaybe<Array<WorkspaceMemberCreateWithoutWorkspaceInput>>;
createMany?: InputMaybe<WorkspaceMemberCreateManyWorkspaceInputEnvelope>;
delete?: InputMaybe<Array<WorkspaceMemberWhereUniqueInput>>;
deleteMany?: InputMaybe<Array<WorkspaceMemberScalarWhereInput>>;
disconnect?: InputMaybe<Array<WorkspaceMemberWhereUniqueInput>>;
set?: InputMaybe<Array<WorkspaceMemberWhereUniqueInput>>;
update?: InputMaybe<Array<WorkspaceMemberUpdateWithWhereUniqueWithoutWorkspaceInput>>;
updateMany?: InputMaybe<Array<WorkspaceMemberUpdateManyWithWhereWithoutWorkspaceInput>>;
upsert?: InputMaybe<Array<WorkspaceMemberUpsertWithWhereUniqueWithoutWorkspaceInput>>;
};
export type WorkspaceMemberUpdateOneWithoutUserNestedInput = {
connect?: InputMaybe<WorkspaceMemberWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceMemberCreateOrConnectWithoutUserInput>;
@ -1594,11 +1313,6 @@ export type WorkspaceMemberUpdateOneWithoutUserNestedInput = {
upsert?: InputMaybe<WorkspaceMemberUpsertWithoutUserInput>;
};
export type WorkspaceMemberUpdateWithWhereUniqueWithoutWorkspaceInput = {
data: WorkspaceMemberUpdateWithoutWorkspaceInput;
where: WorkspaceMemberWhereUniqueInput;
};
export type WorkspaceMemberUpdateWithoutUserInput = {
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
deletedAt?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
@ -1607,20 +1321,6 @@ export type WorkspaceMemberUpdateWithoutUserInput = {
workspace?: InputMaybe<WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput>;
};
export type WorkspaceMemberUpdateWithoutWorkspaceInput = {
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
deletedAt?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
id?: InputMaybe<StringFieldUpdateOperationsInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
user?: InputMaybe<UserUpdateOneRequiredWithoutWorkspaceMemberNestedInput>;
};
export type WorkspaceMemberUpsertWithWhereUniqueWithoutWorkspaceInput = {
create: WorkspaceMemberCreateWithoutWorkspaceInput;
update: WorkspaceMemberUpdateWithoutWorkspaceInput;
where: WorkspaceMemberWhereUniqueInput;
};
export type WorkspaceMemberUpsertWithoutUserInput = {
create: WorkspaceMemberCreateWithoutUserInput;
update: WorkspaceMemberUpdateWithoutUserInput;
@ -1662,22 +1362,6 @@ export type WorkspaceRelationFilter = {
isNot?: InputMaybe<WorkspaceWhereInput>;
};
export type WorkspaceUpdateOneRequiredWithoutCompaniesNestedInput = {
connect?: InputMaybe<WorkspaceWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceCreateOrConnectWithoutCompaniesInput>;
create?: InputMaybe<WorkspaceCreateWithoutCompaniesInput>;
update?: InputMaybe<WorkspaceUpdateWithoutCompaniesInput>;
upsert?: InputMaybe<WorkspaceUpsertWithoutCompaniesInput>;
};
export type WorkspaceUpdateOneRequiredWithoutPeopleNestedInput = {
connect?: InputMaybe<WorkspaceWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceCreateOrConnectWithoutPeopleInput>;
create?: InputMaybe<WorkspaceCreateWithoutPeopleInput>;
update?: InputMaybe<WorkspaceUpdateWithoutPeopleInput>;
upsert?: InputMaybe<WorkspaceUpsertWithoutPeopleInput>;
};
export type WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput = {
connect?: InputMaybe<WorkspaceWhereUniqueInput>;
connectOrCreate?: InputMaybe<WorkspaceCreateOrConnectWithoutWorkspaceMemberInput>;
@ -1686,28 +1370,6 @@ export type WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput = {
upsert?: InputMaybe<WorkspaceUpsertWithoutWorkspaceMemberInput>;
};
export type WorkspaceUpdateWithoutCompaniesInput = {
WorkspaceMember?: InputMaybe<WorkspaceMemberUpdateManyWithoutWorkspaceNestedInput>;
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
deletedAt?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
displayName?: InputMaybe<StringFieldUpdateOperationsInput>;
domainName?: InputMaybe<StringFieldUpdateOperationsInput>;
id?: InputMaybe<StringFieldUpdateOperationsInput>;
people?: InputMaybe<PersonUpdateManyWithoutWorkspaceNestedInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type WorkspaceUpdateWithoutPeopleInput = {
WorkspaceMember?: InputMaybe<WorkspaceMemberUpdateManyWithoutWorkspaceNestedInput>;
companies?: InputMaybe<CompanyUpdateManyWithoutWorkspaceNestedInput>;
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
deletedAt?: InputMaybe<NullableDateTimeFieldUpdateOperationsInput>;
displayName?: InputMaybe<StringFieldUpdateOperationsInput>;
domainName?: InputMaybe<StringFieldUpdateOperationsInput>;
id?: InputMaybe<StringFieldUpdateOperationsInput>;
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type WorkspaceUpdateWithoutWorkspaceMemberInput = {
companies?: InputMaybe<CompanyUpdateManyWithoutWorkspaceNestedInput>;
createdAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
@ -1719,16 +1381,6 @@ export type WorkspaceUpdateWithoutWorkspaceMemberInput = {
updatedAt?: InputMaybe<DateTimeFieldUpdateOperationsInput>;
};
export type WorkspaceUpsertWithoutCompaniesInput = {
create: WorkspaceCreateWithoutCompaniesInput;
update: WorkspaceUpdateWithoutCompaniesInput;
};
export type WorkspaceUpsertWithoutPeopleInput = {
create: WorkspaceCreateWithoutPeopleInput;
update: WorkspaceUpdateWithoutPeopleInput;
};
export type WorkspaceUpsertWithoutWorkspaceMemberInput = {
create: WorkspaceCreateWithoutWorkspaceMemberInput;
update: WorkspaceUpdateWithoutWorkspaceMemberInput;
@ -1793,7 +1445,7 @@ export type DeleteCompaniesMutationVariables = Exact<{
}>;
export type DeleteCompaniesMutation = { __typename?: 'Mutation', deleteManyCompany: { __typename?: 'AffectedRowsOutput', count: number } };
export type DeleteCompaniesMutation = { __typename?: 'Mutation', deleteManyCompany: { __typename?: 'AffectedRows', count: number } };
export type GetPeopleQueryVariables = Exact<{
orderBy?: InputMaybe<Array<PersonOrderByWithRelationInput> | PersonOrderByWithRelationInput>;
@ -1837,7 +1489,7 @@ export type DeletePeopleMutationVariables = Exact<{
}>;
export type DeletePeopleMutation = { __typename?: 'Mutation', deleteManyPerson: { __typename?: 'AffectedRowsOutput', count: number } };
export type DeletePeopleMutation = { __typename?: 'Mutation', deleteManyPerson: { __typename?: 'AffectedRows', count: number } };
export type SearchPeopleQueryQueryVariables = Exact<{
where?: InputMaybe<PersonWhereInput>;
@ -1982,7 +1634,7 @@ export type UpdateCompanyMutationOptions = Apollo.BaseMutationOptions<UpdateComp
export const InsertCompanyDocument = gql`
mutation InsertCompany($id: String!, $name: String!, $domain_name: String!, $account_owner_id: String, $created_at: DateTime, $address: String!, $employees: Int) {
createOneCompany(
data: {id: $id, name: $name, domainName: $domain_name, accountOwner: {connect: {id: $account_owner_id}}, createdAt: $created_at, address: $address, employees: $employees, workspace: {connect: {id: "il faut rajouter l'id du workspace"}}}
data: {id: $id, name: $name, domainName: $domain_name, accountOwner: {connect: {id: $account_owner_id}}, createdAt: $created_at, address: $address, employees: $employees}
) {
address
created_at: createdAt
@ -2163,7 +1815,7 @@ export type UpdatePeopleMutationOptions = Apollo.BaseMutationOptions<UpdatePeopl
export const InsertPersonDocument = gql`
mutation InsertPerson($id: String!, $firstname: String!, $lastname: String!, $phone: String!, $city: String!, $company_id: String, $email: String!, $created_at: DateTime) {
createOnePerson(
data: {id: $id, firstname: $firstname, lastname: $lastname, phone: $phone, city: $city, company: {connect: {id: $company_id}}, email: $email, createdAt: $created_at, workspace: {connect: {id: "il faut rajouter l'id du workspace"}}}
data: {id: $id, firstname: $firstname, lastname: $lastname, phone: $phone, city: $city, company: {connect: {id: $company_id}}, email: $email, createdAt: $created_at}
) {
city
company {
@ -2399,7 +2051,7 @@ export type SearchQueryQueryHookResult = ReturnType<typeof useSearchQueryQuery>;
export type SearchQueryLazyQueryHookResult = ReturnType<typeof useSearchQueryLazyQuery>;
export type SearchQueryQueryResult = Apollo.QueryResult<SearchQueryQuery, SearchQueryQueryVariables>;
export const GetCurrentUserDocument = gql`
query GetCurrentUser($uuid: String) {
query getCurrentUser($uuid: String) {
users(where: {id: {equals: $uuid}}) {
id
email

6
front/src/pages/companies/__tests__/Companies.test.tsx
View File

@ -18,7 +18,9 @@ jest.mock('../../../apollo', () => {
variables: GraphqlMutationCompany;
}) => {
const gqlCompany = arg.variables as unknown as GraphqlQueryCompany;
return { data: companyInterface.mapToCompany(gqlCompany) };
return {
data: { updateOneCompany: companyInterface.mapToCompany(gqlCompany) },
};
},
},
};
@ -84,7 +86,7 @@ it('Checks company url edit is updating data', async () => {
});
});
it('Checks company address edit is updating data', async () => {
it.only('Checks company address edit is updating data', async () => {
const { getByText, getByDisplayValue } = render(<CompaniesDefault />);
await waitFor(() => {

4
front/src/pages/people/__stories__/People.stories.tsx
View File

@ -6,6 +6,10 @@ import { MockedProvider } from '@apollo/client/testing';
import { mockPeopleData } from '../__tests__/__data__/mock-data';
import { GET_PEOPLE } from '../../../services/api/people';
import { SEARCH_PEOPLE_QUERY } from '../../../services/api/search/search';
import {
GraphqlMutationPerson,
GraphqlQueryPerson,
} from '../../../interfaces/entities/person.interface';
const component = {
title: 'People',

7
front/src/pages/people/__tests__/People.test.tsx
View File

@ -18,7 +18,9 @@ jest.mock('../../../apollo', () => {
variables: GraphqlMutationPerson;
}) => {
const gqlPerson = arg.variables as unknown as GraphqlQueryPerson;
return { data: personInterface.mapToPerson(gqlPerson) };
return {
data: { updateOnePerson: personInterface.mapToPerson(gqlPerson) },
};
},
},
};
@ -46,11 +48,12 @@ it('Checks people full name edit is updating data', async () => {
throw new Error('firstNameInput is null');
}
fireEvent.change(nameInput, { target: { value: 'Jo' } });
expect(nameInput).toHaveValue('Jo');
fireEvent.click(getByText('All People')); // Click outside
});
await waitFor(() => {
expect(getByText('Jo Doe')).toBeInTheDocument();
expect(getByText('John Doe')).toBeInTheDocument();
});
});

3
front/src/pages/people/people-columns.tsx
View File

@ -56,8 +56,7 @@ export const usePeopleColumns = () => {
const person = props.row.original;
person.firstname = firstName;
person.lastname = lastName;
const returnedOptimisticResponse = await updatePerson(person);
console.log({ returnedOptimisticResponse });
await updatePerson(person);
}}
/>
),

3
front/src/services/api/companies/update.ts
View File

@ -46,7 +46,6 @@ export const INSERT_COMPANY = gql`
$id: String!
$name: String!
$domain_name: String!
$account_owner_id: String
$created_at: DateTime
$address: String!
$employees: Int
@ -56,11 +55,9 @@ export const INSERT_COMPANY = gql`
id: $id
name: $name
domainName: $domain_name
accountOwner: { connect: { id: $account_owner_id } }
createdAt: $created_at
address: $address
employees: $employees
workspace: { connect: { id: "il faut rajouter l'id du workspace" } }
}
) {
address

38
front/src/services/api/people/update.ts
View File

@ -52,7 +52,6 @@ export const INSERT_PERSON = gql`
$lastname: String!
$phone: String!
$city: String!
$company_id: String
$email: String!
$created_at: DateTime
) {
@ -63,10 +62,8 @@ export const INSERT_PERSON = gql`
lastname: $lastname
phone: $phone
city: $city
company: { connect: { id: $company_id } }
email: $email
createdAt: $created_at
workspace: { connect: { id: "il faut rajouter l'id du workspace" } }
}
) {
city
@ -99,41 +96,6 @@ export async function updatePerson(
const result = await apiClient.mutate({
mutation: UPDATE_PERSON,
variables: mapToGqlPerson(person),
// TODO: use a mapper?
optimisticResponse: {
__typename: 'people' as const,
id: person.id,
update_people: {
returning: {
id: person.id,
city: 'TEST',
company: {
domain_name: person.company?.domainName,
name: person.company?.name,
id: person.company?.id,
},
email: person.email,
firstname: person.firstname,
lastname: person.lastname,
phone: person.phone,
created_at: person.creationDate,
// city
// company {
// domain_name
// name
// id
// }
// email
// firstname
// id
// lastname
// phone
// created_at
},
},
},
});
return result;
}

4
front/src/services/auth/__tests__/AuthService.test.tsx
View File

@ -78,10 +78,10 @@ it('getUserIdFromToken returns null when the token is not valid', async () => {
it('getUserIdFromToken returns the right userId when the token is valid', async () => {
localStorage.setItem(
'accessToken',
'eyJhbGciOiJIUzI1NiJ9.eyJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLXdvcmtzcGFjZS1pZCI6IjdlZDlkMjEyLTFjMjUtNGQwMi1iZjI1LTZhZWNjZjdlYTQxOSIsIngtaGFzdXJhLWFsbG93ZWQtcm9sZXMiOlsibWUiLCJ1c2VyIl0sIngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS11c2VyLWlkIjoiMTY1MDZiYTgtMTk2Yy00YzEzLWE0YTctYTIyY2I1ZWNjZmExIiwieC1oYXN1cmEtdXNlci1pcy1hbm9ueW1vdXMiOiJmYWxzZSJ9LCJzdWIiOiIxNjUwNmJhOC0xOTZjLTRjMTMtYTRhNy1hMjJjYjVlY2NmYTEiLCJpYXQiOjE2ODM4NzM5NzIsImV4cCI6MTY4Mzg3NDg3MiwiaXNzIjoiaGFzdXJhLWF1dGgifQ.C_OynseOprgU-SdLBLzMdfg_441eopI7LYg8yB86g3c',
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiJiNzU5MGRiOS1hYzdkLTQyNzUtOWM2Yy0zMjM5NzkxOTI3OTUiLCJ3b3Jrc3BhY2VJZCI6IjdlZDlkMjEyLTFjMjUtNGQwMi1iZjI1LTZhZWNjZjdlYTQxOSIsImlhdCI6MTY4NTA5MzE3MiwiZXhwIjoxNjg1MDkzNDcyfQ.0g-z2vKBbGGcs0EmZ3Q7HpZ9Yno_SOrprhcQMm1Zb6Y',
);
const userId = getUserIdFromToken();
expect(userId).toBe('16506ba8-196c-4c13-a4a7-a22cb5eccfa1');
expect(userId).toBe('b7590db9-ac7d-4275-9c6c-323979192795');
});
afterEach(() => {