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

Fix storybook tests

Browse Source
This commit is contained in:
Charles Bochet
2023-07-27 23:40:54 -07:00
parent d0641084f9
commit 2cc63e14aa
4 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/src/generated/graphql.tsx
+39 -36
View File
@@ -117,8 +117,8 @@ export type ActivityTarget = {
__typename?: 'ActivityTarget'; __typename?: 'ActivityTarget';
activity: Activity; activity: Activity;
activityId: Scalars['String']; activityId: Scalars['String'];
commentableId: Scalars['String']; commentableId?: Maybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: Maybe<CommentableType>;
company?: Maybe<Company>; company?: Maybe<Company>;
companyId?: Maybe<Scalars['String']>; companyId?: Maybe<Scalars['String']>;
createdAt: Scalars['DateTime']; createdAt: Scalars['DateTime'];
@@ -129,8 +129,8 @@ export type ActivityTarget = {
}; };
export type ActivityTargetCreateManyActivityInput = { export type ActivityTargetCreateManyActivityInput = {
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
companyId?: InputMaybe<Scalars['String']>; companyId?: InputMaybe<Scalars['String']>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
@@ -145,8 +145,8 @@ export type ActivityTargetCreateManyActivityInputEnvelope = {
export type ActivityTargetCreateManyCompanyInput = { export type ActivityTargetCreateManyCompanyInput = {
activityId: Scalars['String']; activityId: Scalars['String'];
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
personId?: InputMaybe<Scalars['String']>; personId?: InputMaybe<Scalars['String']>;
@@ -160,8 +160,8 @@ export type ActivityTargetCreateManyCompanyInputEnvelope = {
export type ActivityTargetCreateManyPersonInput = { export type ActivityTargetCreateManyPersonInput = {
activityId: Scalars['String']; activityId: Scalars['String'];
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
companyId?: InputMaybe<Scalars['String']>; companyId?: InputMaybe<Scalars['String']>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
@@ -175,8 +175,8 @@ export type ActivityTargetCreateManyPersonInputEnvelope = {
export type ActivityTargetCreateManyWorkspaceInput = { export type ActivityTargetCreateManyWorkspaceInput = {
activityId: Scalars['String']; activityId: Scalars['String'];
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
companyId?: InputMaybe<Scalars['String']>; companyId?: InputMaybe<Scalars['String']>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
@@ -231,8 +231,8 @@ export type ActivityTargetCreateOrConnectWithoutWorkspaceInput = {
}; };
export type ActivityTargetCreateWithoutActivityInput = { export type ActivityTargetCreateWithoutActivityInput = {
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
company?: InputMaybe<CompanyCreateNestedOneWithoutActivityTargetInput>; company?: InputMaybe<CompanyCreateNestedOneWithoutActivityTargetInput>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
@@ -242,8 +242,8 @@ export type ActivityTargetCreateWithoutActivityInput = {
export type ActivityTargetCreateWithoutCompanyInput = { export type ActivityTargetCreateWithoutCompanyInput = {
activity: ActivityCreateNestedOneWithoutActivityTargetsInput; activity: ActivityCreateNestedOneWithoutActivityTargetsInput;
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
person?: InputMaybe<PersonCreateNestedOneWithoutActivityTargetInput>; person?: InputMaybe<PersonCreateNestedOneWithoutActivityTargetInput>;
@@ -252,8 +252,8 @@ export type ActivityTargetCreateWithoutCompanyInput = {
export type ActivityTargetCreateWithoutPersonInput = { export type ActivityTargetCreateWithoutPersonInput = {
activity: ActivityCreateNestedOneWithoutActivityTargetsInput; activity: ActivityCreateNestedOneWithoutActivityTargetsInput;
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
company?: InputMaybe<CompanyCreateNestedOneWithoutActivityTargetInput>; company?: InputMaybe<CompanyCreateNestedOneWithoutActivityTargetInput>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
@@ -262,8 +262,8 @@ export type ActivityTargetCreateWithoutPersonInput = {
export type ActivityTargetCreateWithoutWorkspaceInput = { export type ActivityTargetCreateWithoutWorkspaceInput = {
activity: ActivityCreateNestedOneWithoutActivityTargetsInput; activity: ActivityCreateNestedOneWithoutActivityTargetsInput;
commentableId: Scalars['String']; commentableId?: InputMaybe<Scalars['String']>;
commentableType: CommentableType; commentableType?: InputMaybe<CommentableType>;
company?: InputMaybe<CompanyCreateNestedOneWithoutActivityTargetInput>; company?: InputMaybe<CompanyCreateNestedOneWithoutActivityTargetInput>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
@@ -286,8 +286,8 @@ export type ActivityTargetScalarWhereInput = {
NOT?: InputMaybe<Array<ActivityTargetScalarWhereInput>>; NOT?: InputMaybe<Array<ActivityTargetScalarWhereInput>>;
OR?: InputMaybe<Array<ActivityTargetScalarWhereInput>>; OR?: InputMaybe<Array<ActivityTargetScalarWhereInput>>;
activityId?: InputMaybe<StringFilter>; activityId?: InputMaybe<StringFilter>;
commentableId?: InputMaybe<StringFilter>; commentableId?: InputMaybe<StringNullableFilter>;
commentableType?: InputMaybe<EnumCommentableTypeFilter>; commentableType?: InputMaybe<EnumCommentableTypeNullableFilter>;
companyId?: InputMaybe<StringNullableFilter>; companyId?: InputMaybe<StringNullableFilter>;
createdAt?: InputMaybe<DateTimeFilter>; createdAt?: InputMaybe<DateTimeFilter>;
id?: InputMaybe<StringFilter>; id?: InputMaybe<StringFilter>;
@@ -345,8 +345,8 @@ export type ActivityTargetWhereInput = {
OR?: InputMaybe<Array<ActivityTargetWhereInput>>; OR?: InputMaybe<Array<ActivityTargetWhereInput>>;
activity?: InputMaybe<ActivityRelationFilter>; activity?: InputMaybe<ActivityRelationFilter>;
activityId?: InputMaybe<StringFilter>; activityId?: InputMaybe<StringFilter>;
commentableId?: InputMaybe<StringFilter>; commentableId?: InputMaybe<StringNullableFilter>;
commentableType?: InputMaybe<EnumCommentableTypeFilter>; commentableType?: InputMaybe<EnumCommentableTypeNullableFilter>;
company?: InputMaybe<CompanyRelationFilter>; company?: InputMaybe<CompanyRelationFilter>;
companyId?: InputMaybe<StringNullableFilter>; companyId?: InputMaybe<StringNullableFilter>;
createdAt?: InputMaybe<DateTimeFilter>; createdAt?: InputMaybe<DateTimeFilter>;
@@ -559,20 +559,22 @@ export enum ColorScheme {
export type Comment = { export type Comment = {
__typename?: 'Comment'; __typename?: 'Comment';
activity: Activity; activity?: Maybe<Activity>;
activityId: Scalars['String']; activityId?: Maybe<Scalars['String']>;
author: User; author: User;
authorId: Scalars['String']; authorId: Scalars['String'];
body: Scalars['String']; body: Scalars['String'];
commentThreadId?: Maybe<Scalars['String']>;
createdAt: Scalars['DateTime']; createdAt: Scalars['DateTime'];
id: Scalars['ID']; id: Scalars['ID'];
updatedAt: Scalars['DateTime']; updatedAt: Scalars['DateTime'];
}; };
export type CommentCreateInput = { export type CommentCreateInput = {
activity: ActivityCreateNestedOneWithoutCommentsInput; activity?: InputMaybe<ActivityCreateNestedOneWithoutCommentsInput>;
author: UserCreateNestedOneWithoutCommentsInput; author: UserCreateNestedOneWithoutCommentsInput;
body: Scalars['String']; body: Scalars['String'];
commentThreadId?: InputMaybe<Scalars['String']>;
createdAt?: InputMaybe<Scalars['DateTime']>; createdAt?: InputMaybe<Scalars['DateTime']>;
id?: InputMaybe<Scalars['String']>; id?: InputMaybe<Scalars['String']>;
updatedAt?: InputMaybe<Scalars['DateTime']>; updatedAt?: InputMaybe<Scalars['DateTime']>;
@@ -615,10 +617,11 @@ export type CommentWhereInput = {
NOT?: InputMaybe<Array<CommentWhereInput>>; NOT?: InputMaybe<Array<CommentWhereInput>>;
OR?: InputMaybe<Array<CommentWhereInput>>; OR?: InputMaybe<Array<CommentWhereInput>>;
activity?: InputMaybe<ActivityRelationFilter>; activity?: InputMaybe<ActivityRelationFilter>;
activityId?: InputMaybe<StringFilter>; activityId?: InputMaybe<StringNullableFilter>;
author?: InputMaybe<UserRelationFilter>; author?: InputMaybe<UserRelationFilter>;
authorId?: InputMaybe<StringFilter>; authorId?: InputMaybe<StringFilter>;
body?: InputMaybe<StringFilter>; body?: InputMaybe<StringFilter>;
commentThreadId?: InputMaybe<StringNullableFilter>;
createdAt?: InputMaybe<DateTimeFilter>; createdAt?: InputMaybe<DateTimeFilter>;
id?: InputMaybe<StringFilter>; id?: InputMaybe<StringFilter>;
updatedAt?: InputMaybe<DateTimeFilter>; updatedAt?: InputMaybe<DateTimeFilter>;
@@ -814,10 +817,10 @@ export type EnumColorSchemeFilter = {
notIn?: InputMaybe<Array<ColorScheme>>; notIn?: InputMaybe<Array<ColorScheme>>;
}; };
export type EnumCommentableTypeFilter = { export type EnumCommentableTypeNullableFilter = {
equals?: InputMaybe<CommentableType>; equals?: InputMaybe<CommentableType>;
in?: InputMaybe<Array<CommentableType>>; in?: InputMaybe<Array<CommentableType>>;
not?: InputMaybe<NestedEnumCommentableTypeFilter>; not?: InputMaybe<NestedEnumCommentableTypeNullableFilter>;
notIn?: InputMaybe<Array<CommentableType>>; notIn?: InputMaybe<Array<CommentableType>>;
}; };
@@ -1112,10 +1115,10 @@ export type NestedEnumColorSchemeFilter = {
notIn?: InputMaybe<Array<ColorScheme>>; notIn?: InputMaybe<Array<ColorScheme>>;
}; };
export type NestedEnumCommentableTypeFilter = { export type NestedEnumCommentableTypeNullableFilter = {
equals?: InputMaybe<CommentableType>; equals?: InputMaybe<CommentableType>;
in?: InputMaybe<Array<CommentableType>>; in?: InputMaybe<Array<CommentableType>>;
not?: InputMaybe<NestedEnumCommentableTypeFilter>; not?: InputMaybe<NestedEnumCommentableTypeNullableFilter>;
notIn?: InputMaybe<Array<CommentableType>>; notIn?: InputMaybe<Array<CommentableType>>;
}; };
@@ -2205,7 +2208,7 @@ export type CreateCommentMutationVariables = Exact<{
}>; }>;
export type CreateCommentMutation = { __typename?: 'Mutation', createOneComment: { __typename?: 'Comment', id: string, createdAt: string, body: string, activityId: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } } }; export type CreateCommentMutation = { __typename?: 'Mutation', createOneComment: { __typename?: 'Comment', id: string, createdAt: string, body: string, activityId?: string | null, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } } };
export type CreateActivityMutationVariables = Exact<{ export type CreateActivityMutationVariables = Exact<{
activityId: Scalars['String']; activityId: Scalars['String'];
@@ -2218,7 +2221,7 @@ export type CreateActivityMutationVariables = Exact<{
}>; }>;
export type CreateActivityMutation = { __typename?: 'Mutation', createOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, authorId: string, type: ActivityType, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, activityId: string, commentableType: CommentableType, commentableId: string }> | null, comments?: Array<{ __typename?: 'Comment', id: string, createdAt: string, updatedAt: string, body: string, author: { __typename?: 'User', id: string } }> | null } }; export type CreateActivityMutation = { __typename?: 'Mutation', createOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, authorId: string, type: ActivityType, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, activityId: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null, comments?: Array<{ __typename?: 'Comment', id: string, createdAt: string, updatedAt: string, body: string, author: { __typename?: 'User', id: string } }> | null } };
export type GetActivitiesByTargetsQueryVariables = Exact<{ export type GetActivitiesByTargetsQueryVariables = Exact<{
activityTargetIds: Array<Scalars['String']> | Scalars['String']; activityTargetIds: Array<Scalars['String']> | Scalars['String'];
@@ -2226,14 +2229,14 @@ export type GetActivitiesByTargetsQueryVariables = Exact<{
}>; }>;
export type GetActivitiesByTargetsQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, title?: string | null, body?: string | null, type: ActivityType, completedAt?: string | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType: CommentableType, commentableId: string }> | null }> }; export type GetActivitiesByTargetsQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, title?: string | null, body?: string | null, type: ActivityType, completedAt?: string | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null }> };
export type GetActivityQueryVariables = Exact<{ export type GetActivityQueryVariables = Exact<{
activityId: Scalars['String']; activityId: Scalars['String'];
}>; }>;
export type GetActivityQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, body?: string | null, title?: string | null, type: ActivityType, completedAt?: string | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType: CommentableType, commentableId: string }> | null }> }; export type GetActivityQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, body?: string | null, title?: string | null, type: ActivityType, completedAt?: string | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null }> };
export type AddActivityTargetsOnActivityMutationVariables = Exact<{ export type AddActivityTargetsOnActivityMutationVariables = Exact<{
activityId: Scalars['String']; activityId: Scalars['String'];
@@ -2241,7 +2244,7 @@ export type AddActivityTargetsOnActivityMutationVariables = Exact<{
}>; }>;
export type AddActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType: CommentableType, commentableId: string }> | null } }; export type AddActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null } };
export type RemoveActivityTargetsOnActivityMutationVariables = Exact<{ export type RemoveActivityTargetsOnActivityMutationVariables = Exact<{
activityId: Scalars['String']; activityId: Scalars['String'];
@@ -2249,7 +2252,7 @@ export type RemoveActivityTargetsOnActivityMutationVariables = Exact<{
}>; }>;
export type RemoveActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType: CommentableType, commentableId: string }> | null } }; export type RemoveActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null } };
export type DeleteActivityMutationVariables = Exact<{ export type DeleteActivityMutationVariables = Exact<{
activityId: Scalars['String']; activityId: Scalars['String'];
front/src/pages/companies/__stories__/Company.stories.tsx
+1 -1
View File
@@ -91,7 +91,7 @@ export const EditNote: Story = {
graphql.query(getOperationName(GET_ACTIVITY) ?? '', (req, res, ctx) => { graphql.query(getOperationName(GET_ACTIVITY) ?? '', (req, res, ctx) => {
return res( return res(
ctx.data({ ctx.data({
findManyActivitys: [mockedActivities[0]], findManyActivities: [mockedActivities[0]],
}), }),
); );
}), }),
server/src/database/migrations/20230728063528_make_comment_thread_id_optional/migration.sql
+2
View File
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "comments" ALTER COLUMN "commentThreadId" DROP NOT NULL;
server/src/database/schema.prisma
+1 -1
View File
@@ -361,7 +361,7 @@ model Comment {
authorId String authorId String
activity Activity? @relation(fields: [activityId], references: [id], onDelete: Cascade) activity Activity? @relation(fields: [activityId], references: [id], onDelete: Cascade)
activityId String? activityId String?
commentThreadId String commentThreadId String?
/// @TypeGraphQL.omit(input: true, output: true) /// @TypeGraphQL.omit(input: true, output: true)
workspace Workspace @relation(fields: [workspaceId], references: [id]) workspace Workspace @relation(fields: [workspaceId], references: [id])
/// @TypeGraphQL.omit(input: true, output: true) /// @TypeGraphQL.omit(input: true, output: true)